espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

build system: Fix bad partial builds after updates, sdkconfig changes

Browse Source 
Fixes accidental regression merging 9903ea1c11.

Add test case for this kind of rebuilding.
This commit is contained in:
Angus Gratton
2017-09-20 17:38:54 +10:00
committed by Angus Gratton
parent 7e428433e1
commit 85ce07e6fd
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
make/component_wrapper.mk
View File

@@ -147,7 +147,11 @@ endef
# component-specific feature, please don't! What you want is a # component-specific feature, please don't! What you want is a
# Makefile.projbuild for your component (see docs/build-system.rst for # Makefile.projbuild for your component (see docs/build-system.rst for
# more.) # more.)
component_project_vars.mk: #
# Note: The :: target here is not a mistake. This target should always be
# executed, as dependencies are checked by the parent project-level make target.
# See https://www.gnu.org/software/make/manual/make.html#index-_003a_003a-rules-_0028double_002dcolon_0029
component_project_vars.mk::
$(details) "Building component project variables list $(abspath $@)" $(details) "Building component project variables list $(abspath $@)"
@echo '# Automatically generated build file. Do not edit.' > $@ @echo '# Automatically generated build file. Do not edit.' > $@
@echo 'COMPONENT_INCLUDES += $(call MakeVariablePath,$(addprefix $(COMPONENT_PATH)/,$(COMPONENT_ADD_INCLUDEDIRS)))' >> $@ @echo 'COMPONENT_INCLUDES += $(call MakeVariablePath,$(addprefix $(COMPONENT_PATH)/,$(COMPONENT_ADD_INCLUDEDIRS)))' >> $@

2
tools/ci/test_build_system.sh
View File

@@ -165,6 +165,8 @@ function run_tests()
take_build_snapshot take_build_snapshot
touch sdkconfig touch sdkconfig
make make
# check the component_project_vars.mk file was rebuilt
assert_rebuilt esp32/component_project_vars.mk
# pick one each of .c, .cpp, .S that #includes sdkconfig.h # pick one each of .c, .cpp, .S that #includes sdkconfig.h
# and therefore should rebuild # and therefore should rebuild
assert_rebuilt newlib/syscall_table.o assert_rebuilt newlib/syscall_table.o