diff options
| -rw-r--r-- | Config.in | 6 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | docs/manual/manual.mk | 3 |
3 files changed, 18 insertions, 1 deletions
@@ -18,6 +18,10 @@ config BR2_EXTERNAL string option env="BR2_EXTERNAL" +config BR2_BUILD_DIR + string + option env="BUILD_DIR" + # Hidden config symbols for packages to check system gcc version config BR2_HOST_GCC_VERSION string @@ -763,3 +767,5 @@ menu "User-provided options" source "$BR2_EXTERNAL/Config.in" endmenu + +source "$BR2_BUILD_DIR/.br2-external.in" @@ -761,7 +761,7 @@ HOSTCFLAGS = $(CFLAGS_FOR_BUILD) export HOSTCFLAGS .PHONY: prepare-kconfig -prepare-kconfig: outputmakefile +prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/buildroot-config/%onf: mkdir -p $(@D)/lxdialog @@ -780,6 +780,7 @@ COMMON_CONFIG_ENV = \ BR2_CONFIG=$(BR2_CONFIG) \ BR2_EXTERNAL=$(BR2_EXTERNAL) \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ + BUILD_DIR=$(BUILD_DIR) \ SKIP_LEGACY= xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig @@ -880,6 +881,13 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +# Even though the target is a real file, we mark it as PHONY as we +# want it to be re-generated each time make is invoked, in case the +# value of BR2_EXTERNAL is changed. +.PHONY: $(BUILD_DIR)/.br2-external.in +$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) + @touch $@ + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index caf080a84..b26f91234 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -7,6 +7,9 @@ MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) MANUAL_RESOURCES = $(TOPDIR)/docs/images +# Ensure the kconfig snippet is generated (for MANUAL_GEN_LISTS, below): +MANUAL_DEPENDENCIES += prepare-kconfig + # Our manual needs to generate lists define MANUAL_GEN_LISTS $(Q)$(call MESSAGE,"Updating the manual lists...") |