make kernel_menuconfig work without target toolchain

[openwrt/svn-archive/archive.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 24e7e858285be7d8d31816795682dc9912b98020..23e694dc0c11f10136cdb653cd846da9338347e8 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -92,7 +92,6 @@ define Kernel/Configure/2.6
 endef
 define Kernel/Configure/Default
        @$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
-       $(call Kernel/Configure/$(KERNEL))
 endef
 define Kernel/Configure
        $(call Kernel/Configure/Default)
@@ -163,6 +162,7 @@ define BuildKernel
 
   $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
        $(call Kernel/Configure)
+       $(call Kernel/Configure/$(KERNEL))
        touch $$@
 
   $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
@@ -226,7 +226,8 @@ $(eval $(call shexport,Target/Description))
 download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
 compile: $(LINUX_DIR)/.modules
-menuconfig: $(LINUX_DIR)/.configured FORCE
+menuconfig: $(LINUX_DIR)/.prepared FORCE
+       $(call Kernel/Configure)
        $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
        $(SCRIPT_DIR)/config.pl $(LINUX_DIR)/.config > $(PLATFORM_DIR)/config
 ifeq ($(KERNEL),2.6)