diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index c4dae5c8b66..e7cf6b1f1f1 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -120,7 +120,7 @@ let version = "4.5.4"; " --enable-sjlj-exceptions" + " --enable-hash-synchronization" + " --enable-version-specific-runtime-libs" + - " --disable-libssp" + + " --enable-libssp" + " --disable-nls" + " --with-dwarf2" else diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 15529bd554a..f7674bb1184 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -159,13 +159,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 (if targetPlatform.libc == "uclibc" then diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6ece3abd935..05b5ea3a725 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -159,13 +159,9 @@ let version = "4.9.4"; " --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 (if targetPlatform.libc == "uclibc" then diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f6242573e67..10701f687de 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -163,13 +163,9 @@ let version = "5.4.0"; " --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 (if targetPlatform.libc == "uclibc" then diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 324fb3e0c1a..bcee4026c39 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -159,13 +159,9 @@ let version = "6.3.0"; " --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 (if targetPlatform.libc == "uclibc" then diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c8d54308c95..ab56adf1a52 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -160,13 +160,9 @@ let version = "7.1.0"; " --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 (if targetPlatform.libc == "uclibc" then diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index fd34f414f96..09d4f8af869 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -160,13 +160,9 @@ let version = "7-20170409"; " --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 (if targetPlatform.libc == "uclibc" then