summaryrefslogtreecommitdiff
path: root/asmcomp/asmlink.ml
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2001-08-28 14:47:48 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2001-08-28 14:47:48 +0000
commitddd99c7e5d2f0f8e7364e8521fa7e8308999344e (patch)
tree3c0158d035a52c0cf185c08c3288c3c76d6718d0 /asmcomp/asmlink.ml
parentc345611817d76ccc3bbd02db1f942774220739f9 (diff)
downloadocaml-ddd99c7e5d2f0f8e7364e8521fa7e8308999344e.tar.gz
Chargement dynamique de primitives C
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3677 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmcomp/asmlink.ml')
-rw-r--r--asmcomp/asmlink.ml8
1 files changed, 7 insertions, 1 deletions
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
index 15ae74366e..fff54f955b 100644
--- a/asmcomp/asmlink.ml
+++ b/asmcomp/asmlink.ml
@@ -233,7 +233,7 @@ let call_linker file_list startup_file =
(String.concat " " (List.rev file_list))
| _ ->
if not !Clflags.output_c_object then
- Printf.sprintf "%s %s -o %s -I%s %s %s %s %s %s %s %s"
+ Printf.sprintf "%s %s -o %s -I%s %s %s %s %s %s %s %s %s"
!Clflags.c_linker
(if !Clflags.gprofile then "-pg" else "")
!Clflags.exec_name
@@ -244,6 +244,12 @@ let call_linker file_list startup_file =
(String.concat " "
(List.map (fun dir -> if dir = "" then "" else "-L" ^ dir)
!load_path))
+ (String.concat " "
+ (List.map (fun dir -> if dir = "" then "" else
+ Config.native_c_rpath ^ dir)
+ (!Clflags.dllpaths @
+ Dll.ld_library_path_contents() @
+ Dll.ld_conf_contents())))
(String.concat " " (List.rev !Clflags.ccobjs))
runtime_lib
c_lib