From 2557442ae9a8130d77971c994b46d079d80c6106 Mon Sep 17 00:00:00 2001 From: Sergei Silnov Date: Fri, 7 Jun 2019 14:06:15 +0200 Subject: [PATCH] cmake: fix crosstool-NG version check regex --- tools/cmake/crosstool_version_check.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/cmake/crosstool_version_check.cmake b/tools/cmake/crosstool_version_check.cmake index 2ea681da1..93b77d55e 100644 --- a/tools/cmake/crosstool_version_check.cmake +++ b/tools/cmake/crosstool_version_check.cmake @@ -12,11 +12,11 @@ endfunction() function(crosstool_version_check expected_ctng_version) execute_process( - COMMAND ${CMAKE_C_COMPILER} -v - ERROR_VARIABLE toolchain_stderr - OUTPUT_QUIET) + COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE toolchain_version + 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 # with longer git hash strings than others. This will match any version which starts with # the expected version string.