summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2013-11-11 15:27:43 +0100
committerMichal Marek <mmarek@suse.cz>2013-11-11 17:56:43 +0100
commitab7474ea5361f5fe883feb5ae637a1c948df1507 (patch)
treed1a4cf1c0577374090d6984cdc18aac297be2e46
parent6f62259b1a7696a335d5c3f2c89cce1d28912bf2 (diff)
downloadlinux-ab7474ea5361f5fe883feb5ae637a1c948df1507.tar.gz
linux-ab7474ea5361f5fe883feb5ae637a1c948df1507.tar.bz2
linux-ab7474ea5361f5fe883feb5ae637a1c948df1507.zip
Kbuild: Ignore GREP_OPTIONS env variable
When building the kernel in a shell which defines GREP_OPTIONS so that grep behavior is modified, we can break the generation of the syscalls table like so: __SYSCALL_COMMON(^[[01;31m^[[K0^[[m^[[K, sys_read, sys_read) __SYSCALL_COMMON(^[[01;31m^[[K1^[[m^[[K, sys_write, sys_write) __SYSCALL_COMMON(^[[01;31m^[[K1^[[m^[[K0, sys_mprotect, sys_mprotect) ... This is just the initial breakage, later we barf when generating modules. In this case, GREP_OPTIONS contains "--color=always" which adds the shell colors markup and completely fudges the headers under ...generated/asm/. Fix that by unexporting the GREP_OPTIONS variable for the whole kernel build as we tend to use grep at a bunch of places. Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c060363f11c3..2f6c0e9c684a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ LC_COLLATE=C
LC_NUMERIC=C
export LC_COLLATE LC_NUMERIC
+# Avoid interference with shell env settings
+unexport GREP_OPTIONS
+
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#