avoid problem with dlsym/failwith and keep thread linking info

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3701 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 4 insertions, 0 deletions

diff --git a/driver/main.ml b/driver/main.ml
index 4d97a070ed..4370115449 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -118,6 +118,8 @@ let main () =
     end
     else if not !compile_only && !objfiles <> [] then begin
       Compile.init_path();
+      if !thread_safe && systhreads_link <> "" then
+        ccopts := systhreads_link :: !ccopts;
       Bytelink.link (List.rev !objfiles)
     end;
     exit 0
diff --git a/driver/optmain.ml b/driver/optmain.ml
index 572ce7dfaa..79249037e2 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -162,6 +162,8 @@ let main () =
     end
     else if not !compile_only && !objfiles <> [] then begin
       Optcompile.init_path();
+      if !thread_safe && systhreads_link <> "" then
+        ccopts := systhreads_link :: !ccopts;
       Asmlink.link ppf (List.rev !objfiles)
     end;
     exit 0