This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 0502c8343a552cef5f67d17914cea288fdd1a9b8 (commit) via a2bc47df1a55530cb370590003836033d1b31e13 (commit) from ecd15b9a64f1bbfb8bd9e20deeb5ee7c8687112f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0502c8343a552cef5f67d17914cea288fdd1a9b8 commit 0502c8343a552cef5f67d17914cea288fdd1a9b8 Merge: ecd15b9 a2bc47d Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon May 6 08:58:46 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon May 6 08:58:46 2013 -0400 Merge topic 'implicit-linker-detection' into next a2bc47d Recognize ld with toolchain prefix (#13960) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2bc47df1a55530cb370590003836033d1b31e13 commit a2bc47df1a55530cb370590003836033d1b31e13 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Feb 27 15:33:39 2013 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon May 6 08:45:34 2013 -0400 Recognize ld with toolchain prefix (#13960) Teach CMAKE_PARSE_IMPLICIT_LINK_INFO to recognize linker invocations of the form "<toolchain-prefix>-ld" e.g. "x86_64-pc-linux-gnu-ld". 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}") ----------------------------------------------------------------------- Summary of changes: Modules/CMakeParseImplicitLinkInfo.cmake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits