Author: viric
Date: Fri May 25 13:49:01 2012
New Revision: 34242
URL: https://nixos.org/websvn/nix/?rev=34242&sc=1
Log:
Mingw changes to gcc.
Removing a gcc flag, --enable-version-specific-runtime-libs, that put gcc libs
in a speparate directory instead of /lib; this broke the installation of
libgcc_s.a for the case of "--enable-shared" in mingw-w64. And we already have
all gccs in directories apart.
I also add the option --enable-fully-dynamic-string, which is used in the
prebuilt mingw64 toolchain; this way nixpkgs creates ABI-compatible binaries
with mingw64 upstream. (told by jon_y on irc ##mingw)
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Fri May
25 13:32:30 2012 (r34241)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Fri May
25 13:49:01 2012 (r34242)
@@ -127,14 +127,17 @@
" --enable-threads=win32" +
" --enable-sjlj-exceptions" +
" --enable-hash-synchronization" +
- " --enable-version-specific-runtime-libs" +
" --disable-libssp" +
" --disable-nls" +
" --with-dwarf2" +
# I think noone uses shared gcc libs in mingw, so we better do the
same.
- # In any case, g++ linking is broken by default with shared libs,
+ # 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"
+ " --disable-shared" +
+ (if cross.config == "x86_64-w64-mingw32" then
+ # To keep ABI compatibility with upstream mingw-w64
+ " --enable-fully-dynamic-string"
+ else "")
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.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
