summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2012-11-22 01:06:04 +0100
committerMichal Marek <mmarek@suse.cz>2012-12-20 23:02:03 +0100
commitc2838e6ee2d2eae893646f9a271039ae434ed760 (patch)
tree6b671c4ff69fc38f04c336cbdd5811b3478650d9 /scripts
parentmerge_config.sh: Add option to specify output dir (diff)
downloadlinux-c2838e6ee2d2eae893646f9a271039ae434ed760.tar.xz
linux-c2838e6ee2d2eae893646f9a271039ae434ed760.zip
scripts/kconfig: ensure we use proper CONFIG_ prefix
Now that we get the CONFIG_ prefix from the environment, we must ensure we use the proper prefix in case the user has it set in the environment. Simply unexport CONFIG_ to fallback to our hard-coded default. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3091794e9354..231b4759c714 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@ else
Kconfig := Kconfig
endif
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
xconfig: $(obj)/qconf
$< $(Kconfig)