public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCC 4.6: Don't assume `$NIX_GCC/nix-support/orig-libc' exists.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27903
This commit is contained in:
Ludovic Courtès 2011-07-22 14:44:28 +00:00
parent cb8409612c
commit 2cb4bc4a47
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/gcc-4.6/builder.sh
View File

@ -171,13 +171,15 @@ preConfigure() {
rm -Rf zlib rm -Rf zlib
fi fi
# Patch the configure script so it finds glibc headers if test -f "$NIX_GCC/nix-support/orig-libc"; then
# It's important for example in order not to get libssp built, because it's # Patch the configure script so it finds glibc headers. It's
# functionality is in glibc already. # 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" glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
sed -i \ sed -i \
-e s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers, \ -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
gcc/configure gcc/configure
fi
if test -n "$crossMingw" -a -n "$crossStageStatic"; then if test -n "$crossMingw" -a -n "$crossStageStatic"; then
mkdir -p ../mingw mkdir -p ../mingw