[git commit branch/0.9.33] Revert "buildsys: prevent make from searching for .config"
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Wed Mar 20 10:18:36 UTC 2013
commit: http://git.uclibc.org/uClibc/commit/?id=89eae9a77a6619b55f8dcc6bedd02c89418cd5c0
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/0.9.33
This reverts commit c562fca299b1efc4740b458f01036f55fbc090ae.
Fully fixed on master, this hunk alone breaks check WRT .config reading.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
Makefile.in | 4 ++++
Rules.mak | 9 +--------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 69abfaf..b8327e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,10 @@ 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)
diff --git a/Rules.mak b/Rules.mak
index 6608301..7701abb 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -74,16 +74,9 @@ 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)),)
-# Prevent make from searching
-__ABS_KCONFIG_CONFIG := $(abspath $(KCONFIG_CONFIG))
--include $(__ABS_KCONFIG_CONFIG)
+-include $(top_builddir).config
endif
TARGET_ARCH:=$(call qstrip,$(TARGET_ARCH))
ifeq ($(TARGET_ARCH),)
More information about the uClibc-cvs
mailing list