diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2001-09-13 06:06:15 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2001-09-13 06:06:15 +0000 |
| commit | 4cdb4bc3f9aa30aafdeb2257346e9fd31ff8e8b5 (patch) | |
| tree | 54c2718a6105f700d12fd96d255c0c8a776dd6d1 | |
| parent | ebe924d137b77e246b372e704663755e119c8ddf (diff) | |
concatene les rpaths (necessaire pour D/Unix 4.0)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3758 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | bytecomp/bytelink.ml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml index ef50d424d..3028efb43 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -405,6 +405,13 @@ let rec extract suffix l = let build_custom_runtime prim_name exec_name = match Sys.os_type with "Unix" | "Cygwin" -> + let rpath = + String.concat ":" + (List.filter ((<>) "") + (!Clflags.dllpaths @ + Dllpath.ld_library_path_contents() @ + Dllpath.ld_conf_contents())) + in Ccomp.command (Printf.sprintf "%s -o %s -I%s %s %s %s %s %s -lcamlrun %s" @@ -416,12 +423,7 @@ let build_custom_runtime prim_name exec_name = (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.bytecomp_c_rpath ^ dir) - (!Clflags.dllpaths @ - Dllpath.ld_library_path_contents() @ - Dllpath.ld_conf_contents()))) + (if rpath <> "" then Config.bytecomp_c_rpath ^ rpath else "") (String.concat " " (List.rev !Clflags.ccobjs)) Config.bytecomp_c_libraries) | "Win32" -> |