diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-03-03 22:31:18 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-03-03 22:38:48 +0100 |
| commit | e64b342fa8fda783a7247e0469943ce728498004 (patch) | |
| tree | 567a9c73e4fbb2137f9c714848d11287db7692b3 /pkgs/development/compilers/gcc/4.6/default.nix | |
| parent | ae0b5d6813362492e744b1ac10e21309bb4e238b (diff) | |
| download | nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.gz nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.bz2 nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.lz nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.xz nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.zst nixlib-e64b342fa8fda783a7247e0469943ce728498004.zip | |
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And because our Windows cross builds were also poorly maintained and most of the cross-tests were broken as well, I'm just taking this step and try to switch to mingw-w64 for everything "cross Windows". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/compilers/gcc/4.6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 3ed0f7ad0e6d..af1113226980 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -159,10 +159,8 @@ let version = "4.6.3"; # 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" + - (if cross.config == "x86_64-w64-mingw32" then - # To keep ABI compatibility with upstream mingw-w64 - " --enable-fully-dynamic-string" - else "") + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" else (if cross.libc == "uclibc" then # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. |