alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gcc 4.7: when cross-building for GNU, patch gnu.h', not i386/gnu.h'

Browse source
This commit is contained in:
Ludovic Courtès 2012-11-29 10:58:01 +01:00
parent 0397d7c51e
commit cd30b83fd8
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/gcc/4.7/default.nix
View file

@ -181,7 +181,6 @@ stdenv.mkDerivation ({
let let
libc = if libcCross != null then libcCross else stdenv.glibc; libc = if libcCross != null then libcCross else stdenv.glibc;
gnu_h = "gcc/config/gnu.h"; gnu_h = "gcc/config/gnu.h";
i386_gnu_h = "gcc/config/i386/gnu-user.h";
extraCPPDeps = extraCPPDeps =
libc.propagatedBuildInputs libc.propagatedBuildInputs
++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
@ -194,8 +193,8 @@ stdenv.mkDerivation ({
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
else "-L${libpthread}/lib"; else "-L${libpthread}/lib";
in in
'' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..." '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
sed -i "${i386_gnu_h}" \ sed -i "${gnu_h}" \
-es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."