Add -lgcc_s to Cygwin link libraries

ocaml · Nov 11, 2022 · 29d3028 · 29d3028
1 parent 480c26a
commit 29d3028
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,8 @@
 Next version
+- GPR#108: Add -lgcc_s to Cygwin's link libraries, upstreaming a patch from the
+  Cygwin flexdll package (David Allsopp)
+
+Version 0.42
 - GPR#106: Support -l: syntax, to allow static linking of specific libraries (David Allsopp)
 - GPR#103: Delete objects from C files compiled by flexlink (David Allsopp, report by Xavier Leroy)
 - GPR#85: Split multiple arguments passed with a single -Wl (David Allsopp)

diff --git a/reloc.ml b/reloc.ml
@@ -1300,7 +1300,7 @@ let setup_toolchain () =
            Filename.dirname (get_output1 ~use_bash:true "gcc -print-libgcc-file-name");
           ];
       default_libs := ["-lkernel32"; "-luser32"; "-ladvapi32";
-                       "-lshell32"; "-lcygwin"; "-lgcc"]
+                       "-lshell32"; "-lcygwin"; "-lgcc_s"; "-lgcc"]
   | `MSVC | `MSVC64 ->
       search_path := !dirs @
         parse_libpath (try Sys.getenv "LIB" with Not_found -> "");