diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-08 13:11:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-08 13:11:41 (GMT) |
| commit | 482f71c491ada6a55348efe0abb6e418df5aa558 (patch) | |
| tree | f89f5c469a7ea2a597ad2f1f2883dfc654ccdc80 /Modules | |
| parent | ea09ee0cc35440a2005869d4828d8894ab268a28 (diff) | |
| parent | 41aacca7fb61eccf673024180e6020250fb301b2 (diff) | |
| download | CMake-482f71c491ada6a55348efe0abb6e418df5aa558.zip CMake-482f71c491ada6a55348efe0abb6e418df5aa558.tar.gz CMake-482f71c491ada6a55348efe0abb6e418df5aa558.tar.bz2 | |
Merge branch 'implicit-lib-gcceh' into release-3.9
Merge-request: !1460
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 3b77278..63d18ab 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -142,7 +142,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj # We remove items that are not language-specific. set(implicit_libs "") foreach(lib IN LISTS implicit_libs_tmp) - if("x${lib}" MATCHES "^x(crt.*\\.o|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$") + if("x${lib}" MATCHES "^x(crt.*\\.o|gcc_eh.*|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$") string(APPEND log " remove lib [${lib}]\n") elseif(IS_ABSOLUTE "${lib}") get_filename_component(abs "${lib}" ABSOLUTE) |