diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-23 10:13:38 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-23 10:16:32 -0500 |
| commit | 9682de566e264c53018cccd05465f2c5d91ccf73 (patch) | |
| tree | 87e738356006380581ba74a68544a443fa901756 /Modules/CMakeCXXCompiler.cmake.in | |
| parent | 8b4873a1b025d7f47c90f3cafc93ca152b9e4652 (diff) | |
| download | cmake-9682de566e264c53018cccd05465f2c5d91ccf73.tar.gz | |
Revert "Disable shared library support when compiler links statically" (#15855)
In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler
links statically, 2015-09-30) we tried to detect when the compiler is
not capable of linking shared libraries (possibly due to flags in use).
However, the approach is not robust against flags like `-nostdlib`.
Revert it for now pending another solution to the original problem.
Diffstat (limited to 'Modules/CMakeCXXCompiler.cmake.in')
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index 4218a6d12b..52e44f6d5b 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -2,7 +2,6 @@ set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@") set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@") set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@") set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@") -set(CMAKE_CXX_COMPILER_LINKS_STATICALLY "@CMAKE_CXX_COMPILER_LINKS_STATICALLY@") set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_CXX_STANDARD_COMPUTED_DEFAULT@") set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@") set(CMAKE_CXX98_COMPILE_FEATURES "@CMAKE_CXX98_COMPILE_FEATURES@") |