diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-12 14:02:36 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-12 14:02:36 +0000 |
| commit | 620d5b9d4ad00b6f38813ddce037113b8d4b1042 (patch) | |
| tree | 5ac0c405e57791695ed52ff42c9643b291584cc6 /pkgs/build-support | |
| parent | 023e5023409f276e8f6331404a4ee5e07dc9e16a (diff) | |
| download | nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar.gz nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar.bz2 nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar.lz nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar.xz nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.tar.zst nixlib-620d5b9d4ad00b6f38813ddce037113b8d4b1042.zip | |
* Make gcc work properly again in nix-env installations (e.g., when
used outside of builders). svn path=/nixpkgs/trunk/; revision=3317
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index ac61cc1e176f..0e5b90bb877c 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -112,7 +112,9 @@ if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then . "$NIX_GCC_WRAPPER_EXEC_HOOK" fi -res=0 -@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 2> $NIX_BUILD_TOP/.gcc.errors || res=$? -grep -v 'file path prefix' < $NIX_BUILD_TOP/.gcc.errors >&2 || true -exit $res + +# Call the real `gcc'. Filter out warnings about unused `-B' flags, +# since they confuse some programs. +@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} \ + | (grep -v 'file path prefix' || true) +exit ${PIPESTATUS[0]} |