Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suite portage Mingw 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4936 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 2002-06-18 14:54:15 +00:00
parent 926789a144
commit 3fd05809f5
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
asmcomp/asmlink.ml
View File

@ -223,27 +223,8 @@ let call_linker file_list startup_file output_name =
let c_lib =
if !Clflags.nopervasives then "" else Config.native_c_libraries in
let cmd =
match Config.system with
"win32" ->
if not !Clflags.output_c_object then
Printf.sprintf "%s /Fe%s %s %s %s %s %s %s %s"
!Clflags.c_linker
(Filename.quote output_name)
(Clflags.std_include_flag "-I")
(String.concat " " (List.rev !Clflags.ccopts))
(Filename.quote startup_file)
(Ccomp.quote_files (List.rev file_list))
(Ccomp.quote_files
(List.rev_map Ccomp.expand_libname !Clflags.ccobjs))
(Filename.quote runtime_lib)
c_lib
else
Printf.sprintf "%s /out:%s %s %s"
Config.native_partial_linker
(Filename.quote output_name)
(Filename.quote startup_file)
(Ccomp.quote_files (List.rev file_list))
| _ ->
match Config.ccomp_type with
"cc" ->
if not !Clflags.output_c_object then
Printf.sprintf "%s %s -o %s %s %s %s %s %s %s %s %s"
!Clflags.c_linker
@ -265,6 +246,26 @@ let call_linker file_list startup_file output_name =
(Filename.quote output_name)
(Filename.quote startup_file)
(Ccomp.quote_files (List.rev file_list))
| "msvc" ->
if not !Clflags.output_c_object then
Printf.sprintf "%s /Fe%s %s %s %s %s %s %s %s"
!Clflags.c_linker
(Filename.quote output_name)
(Clflags.std_include_flag "-I")
(String.concat " " (List.rev !Clflags.ccopts))
(Filename.quote startup_file)
(Ccomp.quote_files (List.rev file_list))
(Ccomp.quote_files
(List.rev_map Ccomp.expand_libname !Clflags.ccobjs))
(Filename.quote runtime_lib)
c_lib
else
Printf.sprintf "%s /out:%s %s %s"
Config.native_partial_linker
(Filename.quote output_name)
(Filename.quote startup_file)
(Ccomp.quote_files (List.rev file_list))
| _ -> assert false
in if Ccomp.command cmd <> 0 then raise(Error Linking_error)
let object_file_name name =