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

telekid · Nov 29, 2012 · cd30b83 · cd30b83
1 parent 0397d7c
commit cd30b83
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -181,7 +181,6 @@ stdenv.mkDerivation ({
  let
  libc = if libcCross != null then libcCross else stdenv.glibc;
  gnu_h = "gcc/config/gnu.h";
- i386_gnu_h = "gcc/config/i386/gnu-user.h";
  extraCPPDeps =
  libc.propagatedBuildInputs
  ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
@@ -194,8 +193,8 @@ stdenv.mkDerivation ({
  then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
  else "-L${libpthread}/lib";
  in
- '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..."
- sed -i "${i386_gnu_h}" \
+ '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+ sed -i "${gnu_h}" \
  -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
 
  echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."