* Make the grep call optional.

svn path=/nixpkgs/trunk/; revision=3330
This commit is contained in:
Eelco Dolstra 2005-07-13 09:07:54 +00:00
parent a85877edaf
commit 6f8e9bc2f6
3 changed files with 14 additions and 6 deletions

View file

@ -1,5 +1,3 @@
* Bump freetype to 2.1.7 (but it breaks Pango 1.2.5).
* Patch development/tools/misc/libtool not to search standard
directories for libraries (like setup.sh does now). [do we want
this?]
@ -10,3 +8,6 @@
* After building gcc, filter out references to /tmp/nix... in
.../lib/libsupc++.la and .../lib/libstdc++.la
* In libxml2: python2.3 -> python2.4 (or even better, make this
generic; also in bittorrent).

View file

@ -116,6 +116,10 @@ fi
# 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).
(@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 $?
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

View file

@ -1,4 +1,7 @@
export NIX_ENFORCE_PURITY=
alias make=gmake
export MAKE=gmake
shopt -s expand_aliases
shopt -s expand_aliases
# Filter out stupid GCC warnings (in gcc-wrapper).
export NIX_GCC_NEEDS_GREP=1