Author: ludo
Date: Fri Jul 22 14:44:28 2011
New Revision: 27903
URL: https://svn.nixos.org/websvn/nix/?rev=27903&sc=1
Log:
GCC 4.6: Don't assume `$NIX_GCC/nix-support/orig-libc' exists.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh Fri Jul 22
14:03:23 2011 (r27902)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh Fri Jul 22
14:44:28 2011 (r27903)
@@ -171,13 +171,15 @@
rm -Rf zlib
fi
- # Patch the configure script so it finds glibc headers
- # It's important for example in order not to get libssp built, because it's
- # functionality is in glibc already.
- glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
- sed -i \
- -e s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers, \
- gcc/configure
+ if test -f "$NIX_GCC/nix-support/orig-libc"; then
+ # Patch the configure script so it finds glibc headers. It's
+ # important for example in order not to get libssp built,
+ # because its functionality is in glibc already.
+ glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
+ sed -i \
+ -e
"s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+ gcc/configure
+ fi
if test -n "$crossMingw" -a -n "$crossStageStatic"; then
mkdir -p ../mingw
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
