diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-30 06:50:22 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-30 06:50:22 +0000 |
| commit | dcb5d00875b8a6834e7e293aad9e3775518d18e6 (patch) | |
| tree | c49933b89643db7d96d1e5d342afc3a3976bbf1b | |
| parent | 26b06940a9bd894c1a21d76b160a3daea0843417 (diff) | |
| download | upstream-dcb5d00875b8a6834e7e293aad9e3775518d18e6.tar.gz upstream-dcb5d00875b8a6834e7e293aad9e3775518d18e6.tar.bz2 upstream-dcb5d00875b8a6834e7e293aad9e3775518d18e6.zip | |
scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41407
| -rwxr-xr-x | scripts/env | 1 | ||||
| -rwxr-xr-x | scripts/feeds | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/env b/scripts/env index 24d4bec64f..5542b2017b 100755 --- a/scripts/env +++ b/scripts/env @@ -1,6 +1,7 @@ #!/usr/bin/env bash BASEDIR="$PWD" ENVDIR="$PWD/env" +export GREP_OPTIONS= usage() { cat <<EOF diff --git a/scripts/feeds b/scripts/feeds index 85aeab5520..be07e59613 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -11,6 +11,7 @@ use Cwd 'abs_path'; chdir "$FindBin::Bin/.."; $ENV{TOPDIR}=getcwd(); $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'"; +$ENV{GREP_OPTIONS}=""; my $mk=`which gmake 2>/dev/null`; # select the right 'make' program chomp($mk); # trim trailing newline |