Skip to content

Commit 0ca7c02

Browse files
committed
Correct detection of the installed arm-none-eabi-gcc version during the first cmake run.
1 parent 930d513 commit 0ca7c02

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

cmake/arm-none-eabi-checks.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,23 @@ function(arm_none_eabi_gcc_check)
125125
if(NOT version)
126126
message("-- could not find ${prog}")
127127
arm_none_eabi_gcc_install()
128+
gcc_get_version(version
129+
TRIPLET ${arm_none_eabi_triplet}
130+
PROGRAM_NAME prog
131+
PROGRAM_PATH prog_path
132+
)
128133
return()
129134
endif()
130135
message("-- found ${prog} ${version} at ${prog_path}")
131136
if(COMPILER_VERSION_CHECK AND NOT arm_none_eabi_gcc_version STREQUAL version)
132137
message("-- expecting ${prog} version ${arm_none_eabi_gcc_version}, but got version ${version} instead")
133138
arm_none_eabi_gcc_install()
139+
unset(gcc CACHE)
140+
gcc_get_version(version
141+
TRIPLET ${arm_none_eabi_triplet}
142+
PROGRAM_NAME prog
143+
PROGRAM_PATH prog_path
144+
)
134145
return()
135146
endif()
136147
endfunction()

0 commit comments

Comments
 (0)