Browse Source

Merge topic 'implicit-linker-detection'

a2bc47d Recognize ld with toolchain prefix (#13960)
Brad King 12 years ago
parent
commit
18a5c4f4c6
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Modules/CMakeParseImplicitLinkInfo.cmake

+ 1 - 1
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}")