From c148c4c01cbcdbd32aa30b60d9e5e5b79f9e538c Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 6 Oct 2020 00:14:16 +0200 Subject: [PATCH 1/3] esp_wifi: fix quoting --- components/esp_wifi/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt index 6d8de09c19..63876d2be6 100644 --- a/components/esp_wifi/CMakeLists.txt +++ b/components/esp_wifi/CMakeLists.txt @@ -39,7 +39,7 @@ if(CONFIG_ESP32_WIFI_ENABLED) idf_build_get_property(build_dir BUILD_DIR) set(target_name "${idf_target}") - target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}") + target_link_libraries(${COMPONENT_LIB} PUBLIC "-L \"${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}\"") if(link_binary_libs) set(blobs coexist core espnow mesh net80211 pp smartconfig wapi) From ea99e5e969ef617d70bc3868ce1110c66d7181b8 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 30 Aug 2021 22:35:16 +0200 Subject: [PATCH 2/3] esp_phy: fix quoting issue for library path --- components/esp_phy/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_phy/CMakeLists.txt b/components/esp_phy/CMakeLists.txt index 2ca1e68101..9f3064e125 100644 --- a/components/esp_phy/CMakeLists.txt +++ b/components/esp_phy/CMakeLists.txt @@ -22,7 +22,7 @@ idf_component_register(SRCS "${srcs}" idf_build_get_property(build_dir BUILD_DIR) set(target_name "${idf_target}") -target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}") +target_link_libraries(${COMPONENT_LIB} PUBLIC "-L \"${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}\"") if(link_binary_libs) target_link_libraries(${COMPONENT_LIB} PUBLIC phy) From 0277ba7e4e464e6d43369fbec4f85b0eddf6dcb6 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 9 Oct 2020 16:29:32 +0200 Subject: [PATCH 3/3] ulp: fix quoting issues for linker script and map file arguments --- components/ulp/cmake/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/ulp/cmake/CMakeLists.txt b/components/ulp/cmake/CMakeLists.txt index 7043305903..4164f113e4 100644 --- a/components/ulp/cmake/CMakeLists.txt +++ b/components/ulp/cmake/CMakeLists.txt @@ -91,8 +91,9 @@ if(ULP_COCPU_IS_RISCV) add_executable(${ULP_APP_NAME} ${ULP_S_SOURCES}) set(DUMP_SYMBOL_ARGS -g) set(MAP_GEN_EXTRA_ARGS --riscv) - set(EXTRA_LINKER_ARGS "-nostartfiles -Wl,--gc-sections -Xlinker \ --Map=${CMAKE_CURRENT_BINARY_DIR}/${ULP_APP_NAME}.map") + set(EXTRA_LINKER_ARGS "-nostartfiles") + list(APPEND EXTRA_LINKER_ARGS "-Wl,--gc-sections") + list(APPEND EXTRA_LINKER_ARGS "-Wl,-Map=\"${CMAKE_CURRENT_BINARY_DIR}/${ULP_APP_NAME}.map\"") #Makes the csr utillies for riscv visible: target_include_directories(${ULP_APP_NAME} PRIVATE "${IDF_PATH}/components/ulp/ulp_riscv/include") @@ -119,7 +120,7 @@ else() add_executable(${ULP_APP_NAME} ${ULP_PS_SOURCES}) set(DUMP_SYMBOL_ARGS -g -f posix) set(MAP_GEN_EXTRA_ARGS .) - set(EXTRA_LINKER_ARGS "-Map=${CMAKE_CURRENT_BINARY_DIR}/${ULP_APP_NAME}.map") + set(EXTRA_LINKER_ARGS "-Map=\"${CMAKE_CURRENT_BINARY_DIR}/${ULP_APP_NAME}.map\"") endif() @@ -148,5 +149,6 @@ add_custom_target(build ${CMAKE_CURRENT_BINARY_DIR}/${ULP_APP_NAME}.h WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(${ULP_APP_NAME} -T${CMAKE_CURRENT_BINARY_DIR}/${ULP_LD_SCRIPT} ${EXTRA_LINKER_ARGS}) +target_link_libraries(${ULP_APP_NAME} "-T\"${CMAKE_CURRENT_BINARY_DIR}/${ULP_LD_SCRIPT}\"") +target_link_libraries(${ULP_APP_NAME} ${EXTRA_LINKER_ARGS}) set_target_properties(${ULP_APP_NAME} PROPERTIES LINK_DEPENDS ${ULP_LD_SCRIPT})