summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Izard <romain.izard.pro@gmail.com>2016-04-18 11:23:01 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-18 23:12:09 +0200
commitce83c3d515912b0a83ef461f071b88126b0f07d2 (patch)
treeabdbb3cb52d7dbdd445cd6fdfd19541fe6855347
parentb818f0d0604c162e423af9ec3abdf17e58df3179 (diff)
downloadbuildroot-ce83c3d515912b0a83ef461f071b88126b0f07d2.tar.gz
buildroot-ce83c3d515912b0a83ef461f071b88126b0f07d2.zip
core/pkg-kconfig: Factorize make commands
Use a variable to factorize the calls to make, as we use the same set of options multiple times. Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/pkg-kconfig.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index 94ec3cc3a1..cb177bb2cb 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -57,6 +57,9 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
fi; \
done
+$(2)_KCONFIG_MAKE = \
+ $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS)
+
# The specified source configuration file and any additional configuration file
# fragments are merged together to .config, after the package has been patched.
# Since the file could be a defconfig file it needs to be expanded to a
@@ -64,13 +67,11 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
# done even when the package does not support defconfigs.
$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
- $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) $$($(2)_KCONFIG_DEFCONFIG), \
+ $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
cp $$($(2)_KCONFIG_FILE) $$(@))
$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
- $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) oldconfig
+ $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
# If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
# already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
@@ -81,8 +82,7 @@ $$($(2)_DIR)/.config: | $(1)-patch
# The exact rules are specified by the package .mk file.
define $(2)_FIXUP_DOT_CONFIG
$$($(2)_KCONFIG_FIXUP_CMDS)
- $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) oldconfig
+ $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
endef
OpenPOWER on IntegriCloud