diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-01-08 12:07:14 +0100 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-01-08 12:07:14 +0100 |
commit | 0c3eb2da578bc7ba2e74d240e3249dce62ec725e (patch) | |
tree | 89626bb90358b8f8ce92a14615dbff30f2e5d675 | |
parent | 7e5737f1f16c7c49509f37aa499bf1daab327247 (diff) |
buildsys: prevent make from searching for .config
Fixes:
make distclean
mkdir /.config
make -C test/API clean
Reading makefile `../../.config' (search path) (don't care) (no ~ expansion)...
make: *** ../../.config: Is a directory. Stop.
write(1, "Reading makefile `../../.config'"..., 80) = 80
open("../../.config", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/usr/include/../../.config", O_RDONLY) = 6
fstat(6, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
read(6, 0x7f2fe3bfc000, 4096) = -1 EISDIR (Is a directory)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | Rules.mak | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 3593fe130..0a62557de 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,10 +16,6 @@ noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \ include $(top_srcdir)Rules.mak sub_headers := headers -ifndef KCONFIG_CONFIG -KCONFIG_CONFIG := $(top_builddir).config -endif -export KCONFIG_CONFIG ifeq ($(HAVE_DOT_CONFIG),y) @@ -74,9 +74,16 @@ BUILD_CFLAGS = -Os -Wall 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)),) --include $(top_builddir).config +# Prevent make from searching +__ABS_KCONFIG_CONFIG := $(abspath $(KCONFIG_CONFIG)) +-include $(__ABS_KCONFIG_CONFIG) endif TARGET_ARCH:=$(call qstrip,$(TARGET_ARCH)) ifeq ($(TARGET_ARCH),) |