nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix GCCVER cmake define.

Browse source 
Signed-off-by: cuiziwei <cuiziwei@xiaomi.com>
This commit is contained in:
cuiziwei 2024-10-21 20:41:37 +08:00 committed by Mateusz Szafoni
parent 35c278b716
commit 8e95f6800b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/cmake/gcc.cmake
View file

@ -60,7 +60,7 @@ set(NO_LTO "-fno-lto")
if(CONFIG_ARCH_TOOLCHAIN_GNU) if(CONFIG_ARCH_TOOLCHAIN_GNU)
execute_process(COMMAND ${CMAKE_C_COMPILER} --version execute_process(COMMAND ${CMAKE_C_COMPILER} --version
OUTPUT_VARIABLE GCC_VERSION_OUTPUT) OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
string(REGEX MATCH "\\+\\+.* ([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX string(REGEX MATCH "([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX
"${GCC_VERSION_OUTPUT}") "${GCC_VERSION_OUTPUT}")
set(GCCVER ${CMAKE_MATCH_1}) set(GCCVER ${CMAKE_MATCH_1})

6
arch/arm64/src/cmake/Toolchain.cmake
View file

@ -192,9 +192,9 @@ endif()
if(CONFIG_ARCH_TOOLCHAIN_GNU) if(CONFIG_ARCH_TOOLCHAIN_GNU)
if(NOT GCCVER) if(NOT GCCVER)
execute_process(COMMAND ${CMAKE_C_COMPILER} --version execute_process(COMMAND ${CMAKE_C_COMPILER} --version
OUTPUT_VARIABLE GCC_VERSION_INFO) OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
string(REGEX MATCH "[0-9]+\\.[0-9]+" GCC_VERSION ${GCC_VERSION_INFO}) string(REGEX MATCH "([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX
string(REGEX REPLACE "\\..*" "" GCCVER ${GCC_VERSION}) "${GCC_VERSION_OUTPUT}")
set(GCCVER ${CMAKE_MATCH_1}) set(GCCVER ${CMAKE_MATCH_1})
endif() endif()
if(GCCVER GREATER_EQUAL 12) if(GCCVER GREATER_EQUAL 12)

2
arch/risc-v/src/cmake/Toolchain.cmake
View file

@ -261,7 +261,7 @@ if(CONFIG_RISCV_TOOLCHAIN STREQUAL GNU_RVG)
if(NOT GCCVER) if(NOT GCCVER)
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
OUTPUT_VARIABLE GCC_VERSION_OUTPUT) OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
string(REGEX MATCH "\\+\\+.* ([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX string(REGEX MATCH "([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX
"${GCC_VERSION_OUTPUT}") "${GCC_VERSION_OUTPUT}")
set(GCCVER ${CMAKE_MATCH_1}) set(GCCVER ${CMAKE_MATCH_1})
endif() endif()