diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-02-23 08:41:52 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-03-14 22:49:25 +0100 |
| commit | 0a513103bf2a80787ec4c7064570d08ad36881aa (patch) | |
| tree | a58d228984212042f8b5480ebcc2374680bd2c8e /Rules.mak | |
| parent | 7598eeaa1defa2884adaa890bb115c493d69cc35 (diff) | |
buildsys: tweak KCONFIG_CONFIG export
0c3eb2da578bc7ba2e74d240e3249dce62ec725e moved KCONFIG_CONFIG around and
that broke propagation of config-settings to the testsuite. Fix that.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -27,6 +27,13 @@ endif # file named ".config". Don't mess with this file unless # you know what you are doing. +clean_targets := clean realclean distclean \ + objclean-y headers_clean-y CLEAN_utils +noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \ + defconfig allyesconfig allnoconfig \ + xconfig gconfig update-po-config mconf qconf gconf conf \ + release dist tags help + #----------------------------------------------------------- # If you are running a cross compiler, you will want to set @@ -77,14 +84,21 @@ qstrip = $(strip $(subst ",,$(1))) ifndef KCONFIG_CONFIG KCONFIG_CONFIG := $(top_builddir).config endif -export KCONFIG_CONFIG # Pull in the user's uClibc configuration ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) # Prevent make from searching __ABS_KCONFIG_CONFIG := $(abspath $(KCONFIG_CONFIG)) -include $(__ABS_KCONFIG_CONFIG) +else +# else we have to tell config where to write .config +export KCONFIG_CONFIG endif +ifeq ($(HAVE_DOT_CONFIG),y) +# tell config where our .config lives +export KCONFIG_CONFIG +endif + TARGET_ARCH:=$(call qstrip,$(TARGET_ARCH)) ifeq ($(TARGET_ARCH),) ARCH ?= $(shell uname -m | $(SED) -e s/i.86/i386/ \ |