diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2002-01-05 08:49:01 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2002-01-05 08:49:01 +0000 |
| commit | f62ca1a371c8a95bc3f87822cdc29c1eb6e788b8 (patch) | |
| tree | e06a79f55442c8154a7f1ec7edd3f4683b9dbfd0 | |
| parent | 9df60f15056cdbde80a8746b848488a650291d22 (diff) | |
| download | ocaml-f62ca1a371c8a95bc3f87822cdc29c1eb6e788b8.tar.gz | |
merge from HEAD
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/poly_meth2@4231 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | tools/ocamlmklib.mlp | 10 | ||||
| -rw-r--r-- | utils/config.mlp | 2 |
2 files changed, 7 insertions, 5 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 diff --git a/utils/config.mlp b/utils/config.mlp index b866e9ce01..500e26b076 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -12,7 +12,7 @@ (* $Id$ *) -let version = "3.04 with explicit polymorphism" +let version = "3.04+1 with explicit polymorphism (2002-02-05)" let standard_library = try |