diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2003-07-03 16:21:47 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2003-07-03 16:21:47 +0000 |
| commit | 708dfa5e88abd8bb03484d604c89b10e0b6c3764 (patch) | |
| tree | 6c70157a74a4b4c538aa606758259b2868f413dd | |
| parent | ba929756321c56885f280d2f3bccf35a0116baf6 (diff) | |
ocamlopt -pack et Windows, suite
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5654 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile.nt | 1 | ||||
| -rw-r--r-- | asmcomp/asmpackager.ml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.nt b/Makefile.nt index ddc9e3097..6019d87af 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -291,6 +291,7 @@ utils/config.ml: utils/config.mlp config/Makefile -e "s|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|" \ -e "s|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|" \ -e "s|%%PARTIALLD%%|$(PARTIALLD)|" \ + -e "s|%%PACKLD%%|$(PACKLD)|" \ -e "s|%%BYTECCLIBS%%|$(BYTECCLIBS)|" \ -e "s|%%NATIVECCLIBS%%|$(NATIVECCLIBS)|" \ -e 's|%%RANLIBCMD%%|$(RANLIBCMD)|' \ diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml index b80e01e2f..c63f3d11b 100644 --- a/asmcomp/asmpackager.ml +++ b/asmcomp/asmpackager.ml @@ -251,7 +251,7 @@ let make_package_object ppf unit_names objfiles (Ident.create_persistent targetname) coercion); let ld_cmd = sprintf "%s -o %s %s %s" - Config.native_partial_linker + Config.native_pack_linker (Filename.quote targetobj) (Filename.quote objtemp) (Ccomp.quote_files objfiles) in |