diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-08 13:24:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-08 13:25:16 (GMT) |
| commit | bd68d0c252f4ebf91d03837e8404b3cb8c4f7465 (patch) | |
| tree | afdc9a80c73eb3f2dea60bfcf7300b4a163fae3c /Modules | |
| parent | 2ae78569b43228026c929f3c1e7627119a091910 (diff) | |
| parent | 41aacca7fb61eccf673024180e6020250fb301b2 (diff) | |
| download | CMake-bd68d0c252f4ebf91d03837e8404b3cb8c4f7465.zip CMake-bd68d0c252f4ebf91d03837e8404b3cb8c4f7465.tar.gz CMake-bd68d0c252f4ebf91d03837e8404b3cb8c4f7465.tar.bz2 | |
Merge topic 'implicit-lib-gcceh'
41aacca7 Restore exclusion of "gcc_eh" from implicit link libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
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) |