From 25845b10d8ef2ded79fadf7eb924609ff0b142ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 11 May 2016 19:52:31 +0200 Subject: [PATCH] CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100) PathScale uses a wrapper around the linker. The "ldfe" invocation in the output is followed by a normal "ld" invocation. Exclude the former so we can reach and parse the latter correctly. --- Modules/CMakeParseImplicitLinkInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 59092bd2c..ef9a2eb1d 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -31,7 +31,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj # Construct a regex to match linker lines. It must match both the # whole line and just the command (argv[0]). set(linker_regex "^( *|.*[/\\])(${linker}|([^/\\]+-)?ld|collect2)[^/\\]*( |$)") - set(linker_exclude_regex "collect2 version |^[A-Za-z0-9_]+=") + set(linker_exclude_regex "collect2 version |^[A-Za-z0-9_]+=|/ldfe ") set(log "${log} link line regex: [${linker_regex}]\n") string(REGEX REPLACE "\r?\n" ";" output_lines "${text}") foreach(line IN LISTS output_lines)