From 620d5b9d4ad00b6f38813ddce037113b8d4b1042 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2005 14:02:36 +0000
Subject: [PATCH] * Make gcc work properly again in nix-env installations
 (e.g., when   used outside of builders).

svn path=/nixpkgs/trunk/; revision=3317
---
 pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 10 ++++++----
 1 file 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 ac61cc1e176..0e5b90bb877 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]}