Просмотр исходного кода

Merge pull request #290 from us-irs/mueller/set-CMAKE_SYSROOT

Set CMAKE_SYSROOT variable
Julien Staub 3 лет назад
Родитель
Сommit
9f45fed7b3
2 измененных файлов с 2 добавлено и 2 удалено
  1. 2 0
      cmake/stm32/common.cmake
  2. 0 2
      cmake/stm32/utilities.cmake

+ 2 - 0
cmake/stm32/common.cmake

@@ -46,6 +46,8 @@ set(TOOLCHAIN_BIN_PATH "${STM32_TOOLCHAIN_PATH}/bin")
 set(TOOLCHAIN_INC_PATH "${STM32_TOOLCHAIN_PATH}/${STM32_TARGET_TRIPLET}/include")
 set(TOOLCHAIN_LIB_PATH "${STM32_TOOLCHAIN_PATH}/${STM32_TARGET_TRIPLET}/lib")
 
+set(CMAKE_SYSROOT ${TOOLCHAIN_SYSROOT})
+
 find_program(CMAKE_OBJCOPY NAMES ${STM32_TARGET_TRIPLET}-objcopy HINTS ${TOOLCHAIN_BIN_PATH})
 find_program(CMAKE_OBJDUMP NAMES ${STM32_TARGET_TRIPLET}-objdump HINTS ${TOOLCHAIN_BIN_PATH})
 find_program(CMAKE_SIZE NAMES ${STM32_TARGET_TRIPLET}-size HINTS ${TOOLCHAIN_BIN_PATH})

+ 0 - 2
cmake/stm32/utilities.cmake

@@ -17,14 +17,12 @@ function(stm32_util_create_family_targets FAMILY)
         # -Wall: all warnings activated
         # -ffunction-sections -fdata-sections: remove unused code
         target_compile_options(STM32::${FAMILY}${CORE_C} INTERFACE 
-            --sysroot="${TOOLCHAIN_SYSROOT}"
             -mthumb -Wall -ffunction-sections -fdata-sections
         )
         # Set linker flags
         # -mthumb: Generate thumb code
         # -Wl,--gc-sections: Remove unused code
         target_link_options(STM32::${FAMILY}${CORE_C} INTERFACE 
-            --sysroot="${TOOLCHAIN_SYSROOT}"
             -mthumb -Wl,--gc-sections
         )
         target_compile_definitions(STM32::${FAMILY}${CORE_C} INTERFACE