From ad234d1f383d06be4a00851390fb7fbbacd4323d Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jan 2020 14:02:51 +0100 Subject: [PATCH 1/3] ci/buildsystem_sanity_check: ensure USEMODULE is not exported --- dist/tools/buildsystem_sanity_check/check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh index b2ab9eb392..dfddaea29f 100755 --- a/dist/tools/buildsystem_sanity_check/check.sh +++ b/dist/tools/buildsystem_sanity_check/check.sh @@ -84,6 +84,7 @@ UNEXPORTED_VARIABLES+=('LINKFLAGS' 'LINKER_SCRIPT') EXPORTED_VARIABLES_ONLY_IN_VARS=() EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_ARCH') EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_FAM') +EXPORTED_VARIABLES_ONLY_IN_VARS+=('USEMODULE') EXPORTED_VARIABLES_ONLY_IN_VARS+=('TOOLCHAIN') EXPORTED_VARIABLES_ONLY_IN_VARS+=('WERROR') EXPORTED_VARIABLES_ONLY_IN_VARS+=('WPEDANTIC') From 651518aa2f650965a803fa8bd2cd2806fcfb8536 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jan 2020 14:07:04 +0100 Subject: [PATCH 2/3] Makefile.include: don't export USEMODULE_INCLUDES var --- Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index f1770191f3..51b1abb4b6 100644 --- a/Makefile.include +++ b/Makefile.include @@ -419,7 +419,7 @@ BASELIBS += $(APPDEPS) # add extra include paths for packages in $(USEMODULE) -export USEMODULE_INCLUDES = +USEMODULE_INCLUDES = include $(RIOTBASE)/sys/Makefile.include include $(RIOTBASE)/drivers/Makefile.include From 5d5cee0fa53651f0b642c15c07ed9aa9cb4ea684 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jan 2020 14:09:26 +0100 Subject: [PATCH 3/3] ci/buildsystem_sanity: ensure not export USEMODULE_INCLUDES --- dist/tools/buildsystem_sanity_check/check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh index dfddaea29f..674f5b3a2c 100755 --- a/dist/tools/buildsystem_sanity_check/check.sh +++ b/dist/tools/buildsystem_sanity_check/check.sh @@ -80,6 +80,7 @@ UNEXPORTED_VARIABLES+=('STLINK_VERSION') UNEXPORTED_VARIABLES+=('PORT_LINUX' 'PORT_DARWIN') UNEXPORTED_VARIABLES+=('PORT[ ?=:]' 'PORT$') UNEXPORTED_VARIABLES+=('LINKFLAGS' 'LINKER_SCRIPT') +UNEXPORTED_VARIABLES+=('USEMODULE_INCLUDES') EXPORTED_VARIABLES_ONLY_IN_VARS=() EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_ARCH')