From 66dedaa6eec453b4cecb084e9bc1996aee7ec82c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Sep 2014 19:43:38 +0200 Subject: gcc-wrapper: Remove NIX_GCC_NEEDS_GREP This is not needed on any currently supported platform. --- pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh') diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh index f954cae05d86..ec1f6004edd9 100644 --- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh @@ -114,13 +114,4 @@ fi # We want gcc to call the wrapper linker, not that of binutils. export PATH="@ldPath@:$PATH" -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GCC_NEEDS_GREP"; then - @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi +exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -- cgit 1.4.1