summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2001-09-05 10:43:28 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2001-09-05 10:43:28 +0000
commit8e7637f935d81b3717232e902d3b4c15e84ff97d (patch)
tree89c03ba0ba8ba119d93c1ae426aa70584aba220a
parentcd649a7003d2f6dcfc2a7bf249bbddd6f82b0a46 (diff)
bugs in use without DL
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3689 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--tools/ocamlmklib.tpl9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/ocamlmklib.tpl b/tools/ocamlmklib.tpl
index ccfed356f..2c061d029 100644
--- a/tools/ocamlmklib.tpl
+++ b/tools/ocamlmklib.tpl
@@ -40,8 +40,9 @@ while :; do
native_objs="$native_objs $1";;
*.o|*.a)
c_objs="$c_objs $1";;
- -cclib)
- caml_libs="$caml_libs $1 $2";;
+ -cclib|-dllpath)
+ caml_libs="$caml_libs $1 $2"
+ shift;;
-l*)
c_libs="$c_libs $1"
c_libs_caml="$c_libs_caml -cclib $1";;
@@ -94,11 +95,11 @@ if %%SUPPORTS_SHARED_LIBRARIES%%; then
else
if test "$bytecode_objs" != ""; then
$ocamlc -a -custom -o $output.cma $caml_opts $bytecode_objs \
- -cclib -l$output_c $caml_libs $c_opts $c_libs
+ -cclib -l$output_c $caml_libs $c_opts_caml $c_libs_caml
fi
if test "$native_objs" != ""; then
$ocamlopt -a -o $output.cmxa $caml_opts $native_objs \
- -cclib -l$output_c $caml_libs $c_opts $c_libs
+ -cclib -l$output_c $caml_libs $c_opts_caml $c_libs_caml
fi
if test "$c_objs" != ""; then
rm -f lib$output_c.a