diff options
| author | Alain Frisch <alain@frisch.fr> | 2007-10-31 16:54:01 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2007-10-31 16:54:01 +0000 |
| commit | ea7705374f0fa09ade5fdce39e7e5c79eb518cff (patch) | |
| tree | 2f81933de9fffc764af1f2c2ac9f807d41ea701f | |
| parent | 0097d6bd017f57c3cb3a9793e7d696cf718bd84d (diff) | |
| download | ocaml-natdynlink.tar.gz | |
Merge manifest when producing .cmxs.natdynlink
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/natdynlink@8470 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | asmcomp/asmlink.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml index d1398a752c..e72db146ed 100644 --- a/asmcomp/asmlink.ml +++ b/asmcomp/asmlink.ml @@ -258,7 +258,7 @@ let call_linker_shared file_list output_name = let cmd = match Config.system with | "mingw" | "win32" | "cygwin" -> Printf.sprintf - "flexlink -chain %s -o %s %s %s %s %s %s" + "flexlink -merge-manifest -chain %s -o %s %s %s %s %s %s" (match Config.system with | "mingw" -> "mingw" | "win32" -> "msvc" @@ -361,7 +361,7 @@ let call_linker file_list startup_file output_name = (Filename.quote startup_file) (Ccomp.quote_files (List.rev file_list)) in if Ccomp.command cmd <> 0 then raise(Error Linking_error) - | ("msvc",_) -> + | (("win32"|"mingw"|"cygwin"), _) when !Clflags.output_c_object -> let cmd = Printf.sprintf "%s /out:%s %s %s" Config.native_partial_linker |