arm: Fixed compiler path incorrect if compiled on Windows with CMake.

dmitrykos · May 5, 2023 · d06de03 · d06de03
1 parent e091ce7
commit d06de03
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/build/benchmark/eclipse/perf-stm32f407g-disc1-empty/.gitignore b/build/benchmark/eclipse/perf-stm32f407g-disc1-empty/.gitignore
@@ -0,0 +1 @@
+/Release (Fast)/
diff --git a/build/benchmark/eclipse/perf-stm32f407g-disc1-freertos/.gitignore b/build/benchmark/eclipse/perf-stm32f407g-disc1-freertos/.gitignore
@@ -0,0 +1 @@
+/Release (Fast)/
diff --git a/build/benchmark/eclipse/perf-stm32f407g-disc1-stk/.gitignore b/build/benchmark/eclipse/perf-stm32f407g-disc1-stk/.gitignore
@@ -0,0 +1,2 @@
+/Release (Small)/
+/Release (Fast)/
diff --git a/build/cmake/toolchain/arm-none-eabi-gcc.cmake b/build/cmake/toolchain/arm-none-eabi-gcc.cmake
@@ -8,10 +8,10 @@
 #
 
 # Identity
-set(CMAKE_CROSSCOMPILING               TRUE)
-set(CMAKE_SYSTEM_NAME                  Linux)
-set(CMAKE_SYSTEM_VERSION               0)
-set(CMAKE_SYSTEM_PROCESSOR             arm)
+set(CMAKE_CROSSCOMPILING   TRUE)
+set(CMAKE_SYSTEM_NAME      Linux)
+set(CMAKE_SYSTEM_VERSION   0)
+set(CMAKE_SYSTEM_PROCESSOR arm)
 
 # Options
 option(ENABLE_LTO       "enable LTO"               OFF)
@@ -46,8 +46,9 @@ if (NOT TOOLCHAIN_PATH)
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     message(STATUS "Found compiler at path: ${GCC_PATH}")
-    cmake_path(GET GCC_PATH PARENT_PATH TOOLCHAIN_PATH_BIN)
-    #get_filename_component(TOOLCHAIN_PATH_BIN ${GCC_PATH} DIRECTORY)
+    cmake_path(GET GCC_PATH PARENT_PATH TOOLCHAIN_PATH_BIN_RAW)
+    #get_filename_component(TOOLCHAIN_PATH_BIN_RAW ${GCC_PATH} DIRECTORY)
+    string(REPLACE "\\" "/" TOOLCHAIN_PATH_BIN ${TOOLCHAIN_PATH_BIN_RAW})
     message(STATUS "Using compiler path: ${TOOLCHAIN_PATH_BIN}")
     set(TOOLCHAIN_PATH ${TOOLCHAIN_PATH_BIN}/..)
 endif()