Merge pull request #33167 from bnikolic/mingw32-w64-fix

Mingw_w64 fix to get cross-compilation working again
2017-12-29 15:44:17 -05:00
parent 56518ff5ac bc3a6e260a
commit 52a4a7c3bb
8 changed files with 8 additions and 31 deletions
@@ -163,13 +163,9 @@ let version = "4.8.5";
          "--enable-threads=win32"
          "--enable-sjlj-exceptions"
          "--enable-hash-synchronization"
-          "--disable-libssp"
+          "--enable-libssp"
          "--disable-nls"
          "--with-dwarf2"
-          # I think noone uses shared gcc libs in mingw, so we better do the same.
-          # In any case, mingw32 g++ linking is broken by default with shared libs,
-          # unless adding "-lsupc++" to any linking command. I don't know why.
-          "--disable-shared"
          # To keep ABI compatibility with upstream mingw-w64
          "--enable-fully-dynamic-string"
        ] else