gcc-wrapper: Remove NIX_GCC_NEEDS_GREP
This is not needed on any currently supported platform.
This commit is contained in:
parent
cb9f69c052
commit
66dedaa6ee
|
@ -138,13 +138,4 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then
|
|||
source "$NIX_CLANG_WRAPPER_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
# Call the real `clang'. 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_CLANG_NEEDS_GREP"; then
|
||||
@clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
|
||||
else
|
||||
(@clangProg@ ${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 @clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
|
||||
|
|
|
@ -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[@]}
|
||||
|
|
|
@ -143,14 +143,4 @@ if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
|
|||
source "$NIX_GCC_WRAPPER_EXEC_HOOK"
|
||||
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).
|
||||
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[@]}"
|
||||
|
|
|
@ -100,14 +100,4 @@ if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then
|
|||
source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
|
||||
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).
|
||||
if test -z "$NIX_GNAT_NEEDS_GREP"; then
|
||||
@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
|
||||
else
|
||||
(@gnatProg@ ${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 @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
|
||||
|
|
|
@ -30,14 +30,4 @@ if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then
|
|||
source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
|
||||
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).
|
||||
if test -z "$NIX_GNAT_NEEDS_GREP"; then
|
||||
@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]}
|
||||
else
|
||||
(@gnatlinkProg@ ${extraBefore[@]} "$@" ${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 @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]}
|
||||
|
|
|
@ -35,9 +35,6 @@ rec {
|
|||
alias sed=gsed
|
||||
export MAKE=gmake
|
||||
shopt -s expand_aliases
|
||||
|
||||
# Filter out stupid GCC warnings (in gcc-wrapper).
|
||||
export NIX_GCC_NEEDS_GREP=1
|
||||
'';
|
||||
|
||||
prehookOpenBSD = ''
|
||||
|
@ -52,9 +49,6 @@ rec {
|
|||
|
||||
export MAKE=gmake
|
||||
shopt -s expand_aliases
|
||||
|
||||
# Filter out stupid GCC warnings (in gcc-wrapper).
|
||||
export NIX_GCC_NEEDS_GREP=1
|
||||
'';
|
||||
|
||||
prehookNetBSD = ''
|
||||
|
@ -65,9 +59,6 @@ rec {
|
|||
alias tar=gtar
|
||||
export MAKE=gmake
|
||||
shopt -s expand_aliases
|
||||
|
||||
# Filter out stupid GCC warnings (in gcc-wrapper).
|
||||
export NIX_GCC_NEEDS_GREP=1
|
||||
'';
|
||||
|
||||
prehookCygwin = ''
|
||||
|
|
Loading…
Reference in a new issue