From b7fc16a4084a8da85a5dc8446330638a26959ef0 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 13 Jul 2017 10:51:24 +0800 Subject: [PATCH] build system: Updating project Makefile should trigger a full rebuild Project Makefile can set CFLAGS, macro defines, etc. --- make/project.mk | 2 +- tools/ci/test_build_system.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/make/project.mk b/make/project.mk index a0779b464a..8452eaba0b 100644 --- a/make/project.mk +++ b/make/project.mk @@ -90,7 +90,7 @@ export PROJECT_PATH endif # A list of the "common" makefiles, to use as a target dependency -COMMON_MAKEFILES := $(abspath $(IDF_PATH)/make/project.mk $(IDF_PATH)/make/common.mk $(IDF_PATH)/make/component_wrapper.mk) +COMMON_MAKEFILES := $(abspath $(IDF_PATH)/make/project.mk $(IDF_PATH)/make/common.mk $(IDF_PATH)/make/component_wrapper.mk $(firstword $(MAKEFILE_LIST))) export COMMON_MAKEFILES # The directory where we put all objects/libraries/binaries. The project Makefile can diff --git a/tools/ci/test_build_system.sh b/tools/ci/test_build_system.sh index 0d4f36e4d4..ebd711f863 100755 --- a/tools/ci/test_build_system.sh +++ b/tools/ci/test_build_system.sh @@ -160,7 +160,7 @@ function run_tests() assert_rebuilt ${APP_BINS} assert_not_rebuilt ${BOOTLOADER_BINS} - print_status "sdkconfig update triggers recompiles" + print_status "sdkconfig update triggers full recompile" make take_build_snapshot touch sdkconfig @@ -171,6 +171,16 @@ function run_tests() assert_rebuilt nvs_flash/src/nvs_api.o assert_rebuilt freertos/xtensa_vectors.o + print_status "Updating project Makefile triggers full recompile" + make + take_build_snapshot + touch Makefile + make + # similar to previous test + assert_rebuilt newlib/syscall_table.o + assert_rebuilt nvs_flash/src/nvs_api.o + assert_rebuilt freertos/xtensa_vectors.o + print_status "All tests completed" if [ -n "${FAILURES}" ]; then echo "Some failures were detected:" -- 2.40.0