summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2002-01-04 14:15:51 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2002-01-04 14:15:51 +0000
commit9c2f36bbaf2a54e411595611d4bf2c34ec9061c5 (patch)
tree116293ee38d7a80e240c1a92549506c2c1002f37
parent09be0a80800d1820ad5319935d2fd6b54e01d95d (diff)
downloadocaml-9c2f36bbaf2a54e411595611d4bf2c34ec9061c5.tar.gz
On avait oublie de passer !caml_libs au compilo ocamlc ou ocamlopt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4220 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--tools/ocamlmklib.mlp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp
index fc526e572d..92711424fc 100644
--- a/tools/ocamlmklib.mlp
+++ b/tools/ocamlmklib.mlp
@@ -197,7 +197,7 @@ let build_libs () =
end;
if !bytecode_objs <> [] then
scommand
- (sprintf "%s -a %s -o %s.cma %s %s -dllib -l%s -cclib -l%s %s %s %s"
+ (sprintf "%s -a %s -o %s.cma %s %s -dllib -l%s -cclib -l%s %s %s %s %s"
!ocamlc
(if !dynlink then "" else "-custom")
!output
@@ -207,10 +207,11 @@ let build_libs () =
!output_c
(String.concat " " (prefix_list "-ccopt " !c_opts))
(make_rpath_ccopt bytecc_rpath)
- (String.concat " " (prefix_list "-cclib " !c_libs)));
+ (String.concat " " (prefix_list "-cclib " !c_libs))
+ (String.concat " " !caml_libs));
if !native_objs <> [] then
scommand
- (sprintf "%s -a -o %s.cmxa %s %s -cclib -l%s %s %s %s"
+ (sprintf "%s -a -o %s.cmxa %s %s -cclib -l%s %s %s %s %s"
!ocamlopt
!output
(String.concat " " !caml_opts)
@@ -218,7 +219,8 @@ let build_libs () =
!output_c
(String.concat " " (prefix_list "-ccopt " !c_opts))
(make_rpath_ccopt nativecc_rpath)
- (String.concat " " (prefix_list "-cclib " !c_libs)))
+ (String.concat " " (prefix_list "-cclib " !c_libs))
+ (String.concat " " !caml_libs))
let _ =
try