summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2001-02-20 09:40:52 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2001-02-20 09:40:52 +0000
commitb0b5847fe0c7d73223b7015333a24927c6dd1f12 (patch)
treedcf36e4d90c996caaa33fedd16b8b014350fac34
parenteb7578b8db11dbed6960a35abab066ca514592ff (diff)
PR#282: les -ccopt de l'utilisateur doivent etre passes en premier au compilateur C
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3428 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--asmcomp/asmlink.ml2
-rw-r--r--bytecomp/bytelink.ml2
2 files changed, 2 insertions, 2 deletions
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
index 8731d1ebb..15ae74366 100644
--- a/asmcomp/asmlink.ml
+++ b/asmcomp/asmlink.ml
@@ -285,7 +285,7 @@ let link ppf objfiles =
| mg -> raise(Error(Missing_implementations mg))
end;
Clflags.ccobjs := !Clflags.ccobjs @ !lib_ccobjs;
- Clflags.ccopts := !Clflags.ccopts @ !lib_ccopts;
+ Clflags.ccopts := !lib_ccopts @ !Clflags.ccopts; (* put user's opts first *)
let startup = Filename.temp_file "camlstartup" ext_asm in
make_startup_file ppf startup units_tolink;
let startup_obj = Filename.temp_file "camlstartup" ext_obj in
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 827b8b638..41b4c93c3 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -508,7 +508,7 @@ let link objfiles =
else "stdlib.cma" :: (objfiles @ ["std_exit.cmo"]) in
let tolink = List.fold_right scan_file objfiles [] in
Clflags.ccobjs := !Clflags.ccobjs @ !lib_ccobjs;
- Clflags.ccopts := !Clflags.ccopts @ !lib_ccopts;
+ Clflags.ccopts := !lib_ccopts @ !Clflags.ccopts; (* put user's opts first *)
if not !Clflags.custom_runtime then
link_bytecode tolink !Clflags.exec_name true
else if not !Clflags.output_c_object then begin