From f6375952bbdd86421c2df4d1f9ee4dbe4de6363f Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Thu, 29 Nov 2018 12:43:25 +0800 Subject: [PATCH 1/3] kconfig: specify full path of built mconf --- tools/cmake/kconfig.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake index cb2a5c3ca..50f9acc4a 100644 --- a/tools/cmake/kconfig.cmake +++ b/tools/cmake/kconfig.cmake @@ -67,7 +67,7 @@ function(kconfig_process_config) "COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}" "IDF_CMAKE=y" "KCONFIG_CONFIG=${SDKCONFIG}" - ${MCONF} ${ROOT_KCONFIG} + ${CMAKE_BINARY_DIR}/${MCONF} ${ROOT_KCONFIG} VERBATIM USES_TERMINAL) @@ -157,6 +157,7 @@ if(NOT MCONF) BUILD_BYPRODUCTS ${MCONF} INSTALL_COMMAND "" EXCLUDE_FROM_ALL 1 + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} # Put built files on top level build directory ) file(GLOB mconf_srcfiles ${IDF_PATH}/tools/kconfig/*.c) From a2f63c09bf1c829939a17bcd137b8038c40bfda9 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Thu, 29 Nov 2018 13:21:31 +0800 Subject: [PATCH 2/3] make, ldgen: remove uncessary passed target env variable --- make/ldgen.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/make/ldgen.mk b/make/ldgen.mk index 25cd23790..3c2dea127 100644 --- a/make/ldgen.mk +++ b/make/ldgen.mk @@ -17,8 +17,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(LDGEN_SECTIONS_INFO_FILES) --kconfig $(IDF_PATH)/Kconfig \ --env "COMPONENT_KCONFIGS=$(COMPONENT_KCONFIGS)" \ --env "COMPONENT_KCONFIGS_PROJBUILD=$(COMPONENT_KCONFIGS_PROJBUILD)" \ - --env "IDF_CMAKE=n" \ - --env "IDF_TARGET=$(IDF_TARGET)" + --env "IDF_CMAKE=n" endef define ldgen_create_commands From da1f3ea12a02bb2a87b87f4f7168cecccb3f8dc6 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Thu, 29 Nov 2018 13:22:10 +0800 Subject: [PATCH 3/3] kconfig: pass env variable to menuconfig invocation --- tools/cmake/kconfig.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake index 50f9acc4a..2b3dbcb8b 100644 --- a/tools/cmake/kconfig.cmake +++ b/tools/cmake/kconfig.cmake @@ -61,12 +61,13 @@ function(kconfig_process_config) add_custom_target(menuconfig ${menuconfig_depends} # create any missing config file, with defaults if necessary - COMMAND ${confgen_basecommand} --output config ${SDKCONFIG} + COMMAND ${confgen_basecommand} --env "IDF_TARGET=${IDF_TARGET}" --output config ${SDKCONFIG} COMMAND ${CMAKE_COMMAND} -E env "COMPONENT_KCONFIGS=${kconfigs}" "COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}" "IDF_CMAKE=y" "KCONFIG_CONFIG=${SDKCONFIG}" + "IDF_TARGET=${IDF_TARGET}" ${CMAKE_BINARY_DIR}/${MCONF} ${ROOT_KCONFIG} VERBATIM USES_TERMINAL)