From 069ff1f8ea37fc4eef49a44c79985708b56c0ee9 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 15 Apr 2018 22:41:09 +0200 Subject: [PATCH] Non-greedy match of the target triple The former regexp captured next lines as well, causing corruption of CMakeCache.txt. --- cmake/Findrustc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Findrustc.cmake b/cmake/Findrustc.cmake index b6998bb..7c29c0a 100644 --- a/cmake/Findrustc.cmake +++ b/cmake/Findrustc.cmake @@ -27,7 +27,7 @@ mark_as_advanced(RUSTC_EXECUTABLE) execute_process(COMMAND ${RUSTC_EXECUTABLE} -Vv OUTPUT_VARIABLE RUSTC_TARGET_TRIPLE OUTPUT_STRIP_TRAILING_WHITESPACE) -string(REGEX MATCH "host:[ \t](.*)\n" RUSTC_TARGET_TRIPLE "${RUSTC_TARGET_TRIPLE}") +string(REGEX MATCH "host:[ \t]([^\n]*)\n" RUSTC_TARGET_TRIPLE "${RUSTC_TARGET_TRIPLE}") string(REGEX REPLACE "host:[ \t](.*)\n" "\\1" RUSTC_TARGET_TRIPLE "${RUSTC_TARGET_TRIPLE}") set(RUSTC_TARGET_TRIPLE "${RUSTC_TARGET_TRIPLE}" CACHE STRING "Target triple you can pass to rustc (not passed by default)") mark_as_advanced(RUSTC_TARGET_TRIPLE)