diff options
| author | Nicolas Pouillard <np@nicolaspouillard.fr> | 2009-05-26 12:50:41 +0000 |
|---|---|---|
| committer | Nicolas Pouillard <np@nicolaspouillard.fr> | 2009-05-26 12:50:41 +0000 |
| commit | 9ac11d08c3dc4e4573d35c71cb2ada675bcd79c3 (patch) | |
| tree | ee484fc94f5342935c0b57a219725c3fc4b4ef76 | |
| parent | 038ceed4e7f40e83930e5b3321d7baf6b0f62607 (diff) | |
| download | ocaml-9ac11d08c3dc4e4573d35c71cb2ada675bcd79c3.tar.gz | |
build with ocamlbuild: Fix the natdynlink build
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9281 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | build/otherlibs-targets.sh | 3 | ||||
| -rw-r--r-- | myocamlbuild.ml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/otherlibs-targets.sh b/build/otherlibs-targets.sh index 24df9a6d91..2167dd3349 100644 --- a/build/otherlibs-targets.sh +++ b/build/otherlibs-targets.sh @@ -39,6 +39,7 @@ add_c_lib() { add_ocaml_lib() { add_native "$1.cmxa" + add_native "$1.$A" add_byte "$1.cma" } @@ -94,7 +95,7 @@ for lib in $OTHERLIBRARIES; do add_c_lib mldbm;; dynlink) add_ocaml_lib dynlink - add_native dynlink.cmx + add_native dynlink.cmx dynlink.$O add_file $lib.cmi extract_crc;; win32unix) UNIXDIR="otherlibs/win32unix" diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 84572828ca..13775e4b56 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -400,6 +400,7 @@ rule "native stdlib in mixed mode" copy_rule' ~insert:`top "otherlibs/dynlink/natdynlink.ml" "otherlibs/dynlink/nat/dynlink.ml";; copy_rule' ~insert:`top "otherlibs/dynlink/dynlink.mli" "otherlibs/dynlink/nat/dynlink.mli";; copy_rule' ~insert:`top "otherlibs/dynlink/nat/dynlink.cmx" "otherlibs/dynlink/dynlink.cmx";; +copy_rule' ~insert:`top ("otherlibs/dynlink/nat/dynlink"-.-C.o) ("otherlibs/dynlink/dynlink"-.-C.o);; copy_rule' ~insert:`top "otherlibs/dynlink/nat/dynlink.cmxa" "otherlibs/dynlink/dynlink.cmxa";; copy_rule' ~insert:`top ("otherlibs/dynlink/nat/dynlink"-.-C.a) ("otherlibs/dynlink/dynlink"-.-C.a);; dep ["ocaml"; "compile"; "native"; "file:otherlibs/dynlink/nat/dynlink.cmx"] ["otherlibs/dynlink/nat/dynlink.cmi"];; @@ -1090,7 +1091,7 @@ rule "labltk.cma" let labltk_cmxa_contents = labltk_contents "cmx" in rule "labltk.cmxa" - ~prod:"otherlibs/labltk/lib/labltk.cmxa" + ~prods:["otherlibs/labltk/lib/labltk.cmxa"; "otherlibs/labltk/lib/labltk"-.-C.a] ~deps:labltk_cmxa_contents (Ocamlbuild_pack.Ocaml_compiler.native_library_link_modules labltk_lib_contents "otherlibs/labltk/lib/labltk.cmxa");; |