about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2020-06-08 12:43:58 +0800
committerGitHub <noreply@github.com>2020-06-08 12:43:58 +0800
commitf2a33e4486b40434241b964be5c685600c84c3a7 (patch)
treee71ee08edef2b625afb4b78c24915aec0ea65a65
parent58ffaee5d7d02058a1dd8644990b2f3b6c8a94ef (diff)
downloadnixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar.gz
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar.bz2
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar.lz
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar.xz
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.tar.zst
nixlib-f2a33e4486b40434241b964be5c685600c84c3a7.zip
Update configure-flags.nix
-rw-r--r--pkgs/development/compilers/gcc/common/configure-flags.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 0560fe0fda80..7e0d691412b3 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -69,6 +69,11 @@ let
       "--with-gnu-ld"
       "--disable-debug"
       "--disable-win32-registry"
+      "--enable-hash-synchronization"
+      "--enable-libssp"
+      "--disable-nls"
+      # To keep ABI compatibility with upstream mingw-w64
+      "--enable-fully-dynamic-string"      
     ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
       # See Note [Windows Exception Handling]
       "--enable-sjlj-exceptions"
@@ -93,12 +98,6 @@ let
     ] ++ lib.optionals (targetPlatform.libc == "musl") [
       # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
       "--disable-libmpx"
-    ] ++ lib.optionals crossMingw [
-      "--enable-hash-synchronization"
-      "--enable-libssp"
-      "--disable-nls"
-      # To keep ABI compatibility with upstream mingw-w64
-      "--enable-fully-dynamic-string"
     ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
       ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
     );