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 e3cf5a36e87691c9e806e8e2adcbb966735c1012 (commit)
via 25845b10d8ef2ded79fadf7eb924609ff0b142ae (commit)
from 824fa316be79bc424901f35176df3eaa087bc4df (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3cf5a36e87691c9e806e8e2adcbb966735c1012
commit e3cf5a36e87691c9e806e8e2adcbb966735c1012
Merge: 824fa31 25845b1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 11 15:08:58 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed May 11 15:08:58 2016 -0400
Merge topic 'pathscale-implicit-link-info' into next
25845b10 CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25845b10d8ef2ded79fadf7eb924609ff0b142ae
commit 25845b10d8ef2ded79fadf7eb924609ff0b142ae
Author: Michał Górny <mgo...@gentoo.org>
AuthorDate: Wed May 11 19:52:31 2016 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 11 15:06:59 2016 -0400
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.
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake
b/Modules/CMakeParseImplicitLinkInfo.cmake
index 59092bd..ef9a2eb 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)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeParseImplicitLinkInfo.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
