alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_check_crosstool_ng_version' into 'master'

Browse Source 
cmake: fix crosstool-NG version check regex

See merge request idf/esp-idf!5163
This commit is contained in:
Ivan Grokhotkov 2019-06-10 20:23:57 +08:00
commit bde1c30c5b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/cmake/crosstool_version_check.cmake
View File

@ -12,11 +12,11 @@ endfunction()
function(crosstool_version_check expected_ctng_version) function(crosstool_version_check expected_ctng_version)
execute_process( execute_process(
COMMAND ${CMAKE_C_COMPILER} -v COMMAND ${CMAKE_C_COMPILER} --version
ERROR_VARIABLE toolchain_stderr OUTPUT_VARIABLE toolchain_version
OUTPUT_QUIET) ERROR_QUIET)
string(REGEX MATCH "crosstool-ng-[0-9a-g\\.-]+" ctng_version "${toolchain_stderr}") string(REGEX REPLACE ".*(crosstool-NG ([^\)]+)).*\n" "\\2" ctng_version "${toolchain_version}")
# We use FIND to match version instead of STREQUAL because some toolchains are built # We use FIND to match version instead of STREQUAL because some toolchains are built
# with longer git hash strings than others. This will match any version which starts with # with longer git hash strings than others. This will match any version which starts with
# the expected version string. # the expected version string.