diff options
| author | Alain Frisch <alain@frisch.fr> | 2008-04-22 12:24:10 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2008-04-22 12:24:10 +0000 |
| commit | 291a4207ad7a34f2e59f2ecfd6e0fb14afd31c62 (patch) | |
| tree | bd96989c887e8240219e2c200e5e1303290178bc /Makefile.nt | |
| parent | f3f7dd8919e61e66faaf9004fa6fc962eaf1b141 (diff) | |
| download | ocaml-291a4207ad7a34f2e59f2ecfd6e0fb14afd31c62.tar.gz | |
Cleanup natdynlink. Automatic initialization of Dynlink (bytecode and native code). Do not use RTLD_GLOBAL for Dynlink.loadfile_private in native code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8873 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
| -rw-r--r-- | Makefile.nt | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Makefile.nt b/Makefile.nt index 99d4b6cdc8..ce1ec743e5 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -233,7 +233,7 @@ installbyt: mkdir -p $(STUBLIBDIR) for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i install; done cd win32caml ; $(MAKE) install - ./build/partial-install.sh +# ./build/partial-install.sh cp config/Makefile $(LIBDIR)/Makefile.config cp README $(DISTRIB)/Readme.general.txt cp README.win32 $(DISTRIB)/Readme.windows.txt @@ -583,17 +583,25 @@ alldepend:: # Camlp4 -camlp4out: ocamlc otherlibraries ocamlbuild-partial-boot ocamlbuild.byte - ./build/camlp4-byte-only.sh -camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-partial-boot ocamlbuild.native - ./build/camlp4-native-only.sh +#camlp4out: ocamlc otherlibraries ocamlbuild-partial-boot ocamlbuild.byte +# ./build/camlp4-byte-only.sh +#camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-partial-boot ocamlbuild.native +# ./build/camlp4-native-only.sh + +camlp4out: + +camlp4opt: # Ocamlbuild -ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-partial-boot - ./build/ocamlbuild-byte-only.sh -ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot - ./build/ocamlbuild-native-only.sh +ocamlbuild.byte: + +ocamlbuild.native: + +#ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-partial-boot +# ./build/ocamlbuild-byte-only.sh +#ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot +# ./build/ocamlbuild-native-only.sh ocamlbuildlib.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot ./build/ocamlbuildlib-native-only.sh |