summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-06-21 20:13:20 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-06-21 20:16:34 (GMT)
commit2691d80803c96e32d923b0a20708b2dcb9aac20a (patch)
treef57c71c241667b04de52fd3cabf63d54f1b92439
parentb8cca06b5089821ee8fb7087d1f88e5e2c74edf8 (diff)
downloadbuildroot-2691d80803c96e32d923b0a20708b2dcb9aac20a.tar.gz
buildroot-2691d80803c96e32d923b0a20708b2dcb9aac20a.tar.bz2
Makefile: fix make <blah>_defconfig
Make sure we only pass O=<path> if we were originally called like that, otherwise we might end up looking for the .config in the wrong place. Likewise, when changing between using O= or not (or simply running make <blah>_defconfig in a pristine source tree), we do end up having a .config, but no .config.cmd. It isn't really critical so just continue even if we couldn't read it. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ef78de1..c8f211b 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@ include package/Makefile.in
all: world
# In this section, we need .config
-include $(CONFIG_DIR)/.config.cmd
+-include $(CONFIG_DIR)/.config.cmd
# We also need the various per-package makefiles, which also add
# each selected package to TARGETS if that package was selected
@@ -587,7 +587,11 @@ flush:
%_defconfig: $(TOPDIR)/configs/%_defconfig
cp $^ $(CONFIG_DIR)/.config
+ifeq ($(O),output)
+ @$(MAKE) oldconfig
+else
@$(MAKE) O=$(O) oldconfig
+endif
configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config