diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-29 10:58:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-29 10:58:41 +0100 |
| commit | cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa (patch) | |
| tree | f8ac209474855e0602eb018fe97c4170411487d9 | |
| parent | 0397d7c51e11862a8000ffacb622956fc1fa83bf (diff) | |
| download | nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar.gz nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar.bz2 nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar.lz nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar.xz nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.tar.zst nixpkgs-cd30b83fd8c4d7631c67609b0f2afd8e728ec1fa.zip | |
gcc 4.7: when cross-building for GNU, patch `gnu.h', not `i386/gnu.h'
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 53bba5b572d..5053e105aeb 100644 --- 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}'..." |