diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-12-29 15:44:17 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-29 15:44:17 -0500 |
commit | 52a4a7c3bbb5c60804f232f1f2f74e806632cfa0 (patch) | |
tree | 3fbbe2c42e084767384feefbd3afcb52ddd9b9f2 /pkgs/development/compilers | |
parent | 56518ff5ac232b41a96f3c191103e309309cbe9e (diff) | |
parent | bc3a6e260a9fc9924f86c36fc522a996df5d3e26 (diff) | |
download | nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar.gz nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar.bz2 nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar.lz nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar.xz nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.tar.zst nixlib-52a4a7c3bbb5c60804f232f1f2f74e806632cfa0.zip |
Merge pull request #33167 from bnikolic/mingw32-w64-fix
Mingw_w64 fix to get cross-compilation working again
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gcc/4.5/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/snapshot/default.nix | 6 |
7 files changed, 7 insertions, 31 deletions
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b4ae867d5859..36fde924e9b9 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -118,7 +118,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 4efac1b26c34..e626abc50d14 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -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 diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index fb4218a0edea..621c45cdff38 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -154,13 +154,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 diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b4399ef72f19..709e87c34454 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -157,13 +157,9 @@ let version = "5.5.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 diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d923092168ab..33a034adf667 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -155,13 +155,9 @@ let version = "6.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 diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c9daf813e6f8..291ec944b554 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -153,13 +153,9 @@ let version = "7.2.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 diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 9d1bdc08133d..e8668712e2ea 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -153,13 +153,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 |