clean up uClibc config handling - use kconfig.pl to split configs similar to how...

[openwrt/openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index f5bfa2f3f43feab76635e13cd44f832240c70001..906767da2269830c2647f0741647a09bffc3f612 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -86,6 +86,8 @@ define Host/Prepare/V_0_9_28
  endif
 endef
 
+GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n $(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD))
+
 define Host/Prepare
        $(call Host/SetToolchainInfo)
        @echo prepare uClibc version $(PKG_VERSION)$(PKG_EXTRAVERSION)  
@@ -95,7 +97,7 @@ define Host/Prepare
        $(call Host/Prepare/Default)
        ln -snf $(PKG_NAME)-$(PKG_VERSION)$(PKG_EXTRAVERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
  endif
-       $(CP) ./$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD)) $(HOST_BUILD_DIR)/.config
+       $(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config
  ifeq ($(PKG_VERSION),0.9.28)
        $(call Host/Prepare/V_0_9_28)
  endif