pyrox.dev / nixpkgs
lol
fork atom

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

Mingw_w64 fix to get cross-compilation working again

authored by John Ericson and committed by GitHub 52a4a7c3 56518ff5

+8 -31
unified split
+1 -1
pkgs/development/compilers/gcc/4.5/default.nix
··· 118 "--enable-sjlj-exceptions" 119 "--enable-hash-synchronization" 120 "--enable-version-specific-runtime-libs" 121 - "--disable-libssp" 122 "--disable-nls" 123 "--with-dwarf2" 124 ] else [
··· 118 "--enable-sjlj-exceptions" 119 "--enable-hash-synchronization" 120 "--enable-version-specific-runtime-libs" 121 + "--enable-libssp" 122 "--disable-nls" 123 "--with-dwarf2" 124 ] else [
+1 -5
pkgs/development/compilers/gcc/4.8/default.nix
··· 163 "--enable-threads=win32" 164 "--enable-sjlj-exceptions" 165 "--enable-hash-synchronization" 166 - "--disable-libssp" 167 "--disable-nls" 168 "--with-dwarf2" 169 - # I think noone uses shared gcc libs in mingw, so we better do the same. 170 - # In any case, mingw32 g++ linking is broken by default with shared libs, 171 - # unless adding "-lsupc++" to any linking command. I don't know why. 172 - "--disable-shared" 173 # To keep ABI compatibility with upstream mingw-w64 174 "--enable-fully-dynamic-string" 175 ] else
··· 163 "--enable-threads=win32" 164 "--enable-sjlj-exceptions" 165 "--enable-hash-synchronization" 166 + "--enable-libssp" 167 "--disable-nls" 168 "--with-dwarf2" 169 # To keep ABI compatibility with upstream mingw-w64 170 "--enable-fully-dynamic-string" 171 ] else
+1 -5
pkgs/development/compilers/gcc/4.9/default.nix
··· 154 "--enable-threads=win32" 155 "--enable-sjlj-exceptions" 156 "--enable-hash-synchronization" 157 - "--disable-libssp" 158 "--disable-nls" 159 "--with-dwarf2" 160 - # I think noone uses shared gcc libs in mingw, so we better do the same. 161 - # In any case, mingw32 g++ linking is broken by default with shared libs, 162 - # unless adding "-lsupc++" to any linking command. I don't know why. 163 - "--disable-shared" 164 # To keep ABI compatibility with upstream mingw-w64 165 "--enable-fully-dynamic-string" 166 ] else
··· 154 "--enable-threads=win32" 155 "--enable-sjlj-exceptions" 156 "--enable-hash-synchronization" 157 + "--enable-libssp" 158 "--disable-nls" 159 "--with-dwarf2" 160 # To keep ABI compatibility with upstream mingw-w64 161 "--enable-fully-dynamic-string" 162 ] else
+1 -5
pkgs/development/compilers/gcc/5/default.nix
··· 157 "--enable-threads=win32" 158 "--enable-sjlj-exceptions" 159 "--enable-hash-synchronization" 160 - "--disable-libssp" 161 "--disable-nls" 162 "--with-dwarf2" 163 - # I think noone uses shared gcc libs in mingw, so we better do the same. 164 - # In any case, mingw32 g++ linking is broken by default with shared libs, 165 - # unless adding "-lsupc++" to any linking command. I don't know why. 166 - "--disable-shared" 167 # To keep ABI compatibility with upstream mingw-w64 168 "--enable-fully-dynamic-string" 169 ] else
··· 157 "--enable-threads=win32" 158 "--enable-sjlj-exceptions" 159 "--enable-hash-synchronization" 160 + "--enable-libssp" 161 "--disable-nls" 162 "--with-dwarf2" 163 # To keep ABI compatibility with upstream mingw-w64 164 "--enable-fully-dynamic-string" 165 ] else
+1 -5
pkgs/development/compilers/gcc/6/default.nix
··· 155 "--enable-threads=win32" 156 "--enable-sjlj-exceptions" 157 "--enable-hash-synchronization" 158 - "--disable-libssp" 159 "--disable-nls" 160 "--with-dwarf2" 161 - # I think noone uses shared gcc libs in mingw, so we better do the same. 162 - # In any case, mingw32 g++ linking is broken by default with shared libs, 163 - # unless adding "-lsupc++" to any linking command. I don't know why. 164 - "--disable-shared" 165 # To keep ABI compatibility with upstream mingw-w64 166 "--enable-fully-dynamic-string" 167 ] else
··· 155 "--enable-threads=win32" 156 "--enable-sjlj-exceptions" 157 "--enable-hash-synchronization" 158 + "--enable-libssp" 159 "--disable-nls" 160 "--with-dwarf2" 161 # To keep ABI compatibility with upstream mingw-w64 162 "--enable-fully-dynamic-string" 163 ] else
+1 -5
pkgs/development/compilers/gcc/7/default.nix
··· 153 "--enable-threads=win32" 154 "--enable-sjlj-exceptions" 155 "--enable-hash-synchronization" 156 - "--disable-libssp" 157 "--disable-nls" 158 "--with-dwarf2" 159 - # I think noone uses shared gcc libs in mingw, so we better do the same. 160 - # In any case, mingw32 g++ linking is broken by default with shared libs, 161 - # unless adding "-lsupc++" to any linking command. I don't know why. 162 - "--disable-shared" 163 # To keep ABI compatibility with upstream mingw-w64 164 "--enable-fully-dynamic-string" 165 ] else
··· 153 "--enable-threads=win32" 154 "--enable-sjlj-exceptions" 155 "--enable-hash-synchronization" 156 + "--enable-libssp" 157 "--disable-nls" 158 "--with-dwarf2" 159 # To keep ABI compatibility with upstream mingw-w64 160 "--enable-fully-dynamic-string" 161 ] else
+1 -5
pkgs/development/compilers/gcc/snapshot/default.nix
··· 153 "--enable-threads=win32" 154 "--enable-sjlj-exceptions" 155 "--enable-hash-synchronization" 156 - "--disable-libssp" 157 "--disable-nls" 158 "--with-dwarf2" 159 - # I think noone uses shared gcc libs in mingw, so we better do the same. 160 - # In any case, mingw32 g++ linking is broken by default with shared libs, 161 - # unless adding "-lsupc++" to any linking command. I don't know why. 162 - "--disable-shared" 163 # To keep ABI compatibility with upstream mingw-w64 164 "--enable-fully-dynamic-string" 165 ] else
··· 153 "--enable-threads=win32" 154 "--enable-sjlj-exceptions" 155 "--enable-hash-synchronization" 156 + "--enable-libssp" 157 "--disable-nls" 158 "--with-dwarf2" 159 # To keep ABI compatibility with upstream mingw-w64 160 "--enable-fully-dynamic-string" 161 ] else
+1
pkgs/os-specific/windows/mingw-w64/default.nix
··· 4 inherit (callPackage ./common.nix {}) name src; 5 buildInputs = [ windows.mingw_w64_headers ]; 6 dontStrip = true; 7 }
··· 4 inherit (callPackage ./common.nix {}) name src; 5 buildInputs = [ windows.mingw_w64_headers ]; 6 dontStrip = true; 7 + hardeningDisable = [ "stackprotector" "fortify" ]; 8 }