|
@@ -27,6 +27,9 @@ define kconfig-package-update-config
|
|
$(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE)
|
|
$(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE)
|
|
endef
|
|
endef
|
|
|
|
|
|
|
|
+PKG_KCONFIG_COMMON_OPTS = \
|
|
|
|
+ HOSTCC=$(HOSTCC_NOCCACHE)
|
|
|
|
+
|
|
################################################################################
|
|
################################################################################
|
|
# inner-kconfig-package -- generates the make targets needed to support a
|
|
# inner-kconfig-package -- generates the make targets needed to support a
|
|
# kconfig package
|
|
# kconfig package
|
|
@@ -79,7 +82,8 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
|
|
done
|
|
done
|
|
|
|
|
|
$(2)_KCONFIG_MAKE = \
|
|
$(2)_KCONFIG_MAKE = \
|
|
- $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS)
|
|
|
|
|
|
+ $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
|
|
|
|
+ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS)
|
|
|
|
|
|
# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax
|
|
# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax
|
|
# of the shell conflicts with Make's own syntax, this means that backticks
|
|
# of the shell conflicts with Make's own syntax, this means that backticks
|
|
@@ -195,7 +199,7 @@ $(2)_CONFIGURATOR_MAKE_ENV = \
|
|
$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_%
|
|
$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_%
|
|
$$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done
|
|
$$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done
|
|
$$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
|
|
$$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
|
|
- $$($(2)_KCONFIG_OPTS) $$(*)
|
|
|
|
|
|
+ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) $$(*)
|
|
rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
|
|
rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
|
|
rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed
|
|
rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed
|
|
$$($(2)_FIXUP_DOT_CONFIG)
|
|
$$($(2)_FIXUP_DOT_CONFIG)
|
|
@@ -224,7 +228,7 @@ $(1)-check-configuration-done:
|
|
|
|
|
|
$(1)-savedefconfig: $(1)-check-configuration-done
|
|
$(1)-savedefconfig: $(1)-check-configuration-done
|
|
$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
|
|
$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
|
|
- $$($(2)_KCONFIG_OPTS) savedefconfig
|
|
|
|
|
|
+ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) savedefconfig
|
|
|
|
|
|
# Target to copy back the configuration to the source configuration file
|
|
# Target to copy back the configuration to the source configuration file
|
|
# Even though we could use 'cp --preserve-timestamps' here, the separate
|
|
# Even though we could use 'cp --preserve-timestamps' here, the separate
|