diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-24 09:26:31 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-24 09:26:31 -0500 |
| commit | b2de70a036cb3e1ae677b0a923c05276af4e6054 (patch) | |
| tree | 5f243ab5086d2641c58d9826336a5044332984c3 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 2bcc63e5b5fe0612189400d2b6d3c13acc12e0af (diff) | |
| parent | 9682de566e264c53018cccd05465f2c5d91ccf73 (diff) | |
| download | cmake-b2de70a036cb3e1ae677b0a923c05276af4e6054.tar.gz | |
Merge topic 'revert-compiler-links-statically'
9682de56 Revert "Disable shared library support when compiler links statically" (#15855)
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 2e741004b3..81c25090c3 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -106,7 +106,6 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) set(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}" PARENT_SCOPE) set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX}" PARENT_SCOPE) - set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY "${CMAKE_${lang}_COMPILER_LINKS_STATICALLY}" PARENT_SCOPE) set(CMAKE_${lang}_COMPILER_VERSION "${CMAKE_${lang}_COMPILER_VERSION}" PARENT_SCOPE) set(CMAKE_${lang}_SIMULATE_ID "${CMAKE_${lang}_SIMULATE_ID}" PARENT_SCOPE) set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE) @@ -533,13 +532,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) endif() endif() - if(UNIX) - execute_process(COMMAND file "${file}" OUTPUT_VARIABLE out ERROR_VARIABLE out) - if(out MATCHES "statically linked") - set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY 1 PARENT_SCOPE) - endif() - endif() - # Check if a valid compiler and platform were found. if(COMPILER_ID AND NOT COMPILER_ID_TWICE) set(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}") |