diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:37:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:37:46 (GMT) |
| commit | 18a5c4f4c652797ac32aac91c8c5c95ce9b24c91 (patch) | |
| tree | 7d48e7b6d44da55412258e0ac22d19b221326669 /Modules | |
| parent | 831dd5abab9d42c3c23c8087b25402ccea227710 (diff) | |
| parent | a2bc47df1a55530cb370590003836033d1b31e13 (diff) | |
| download | CMake-18a5c4f4c652797ac32aac91c8c5c95ce9b24c91.zip CMake-18a5c4f4c652797ac32aac91c8c5c95ce9b24c91.tar.gz CMake-18a5c4f4c652797ac32aac91c8c5c95ce9b24c91.tar.bz2 | |
Merge topic 'implicit-linker-detection'
a2bc47d Recognize ld with toolchain prefix (#13960)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeParseImplicitLinkInfo.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 80e0218..fa03630 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -29,7 +29,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj endif() # 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_regex "^( *|.*[/\\])(${linker}|([^/\\]+-)?ld|collect2)[^/\\]*( |$)") set(linker_exclude_regex "collect2 version ") set(log "${log} link line regex: [${linker_regex}]\n") string(REGEX REPLACE "\r?\n" ";" output_lines "${text}") |