From 52d6c43329fcfc0aedcc2cbdbaef096360eaa741 Mon Sep 17 00:00:00 2001 From: Phil Miller Date: Fri, 2 Sep 2022 16:41:47 -0600 Subject: [PATCH] #10982: Stop forcing CMake to pass to -fPIE on all compilations, as this leads to link failures with Intel 19 --- cmake/std/atdm/ATDMDevEnvSettings.cmake | 4 ---- packages/framework/ini-files/config-specs.ini | 2 +- .../pr_tools/trilinosprhelpers/unittests/config-specs.ini | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake index c5a6c1ca980b..f35157dcd2c5 100644 --- a/cmake/std/atdm/ATDMDevEnvSettings.cmake +++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake @@ -217,10 +217,6 @@ IF ((ATDM_COMPILER MATCHES ".*CLANG.*") AND ATDM_ADDRESS_SANITIZER) SET(EXTRA_EXTRA_LINK_FLAGS "${EXTRA_EXTRA_LINK_FLAGS} -ldl -fsanitize=address") ENDIF() -# FPIC -IF (ATDM_FPIC) - SET(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Build targets with position independent code") -ENDIF() SET(CMAKE_C_FLAGS "$ENV{ATDM_CONFIG_C_FLAGS} ${CMAKE_C_FLAGS}") diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 0fd0f532f060..cf08c60985b2 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -670,7 +670,7 @@ opt-set-cmake-var Trilinos_ENABLE_COMPLEX BOOL : OFF # [USE-FPIC|YES] -opt-set-cmake-var CMAKE_POSITION_INDEPENDENT_CODE BOOL : ON +# Nothing to do here. [USE-FPIC|NO] # Nothing to do here. diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini b/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini index 6174dd775222..6d76baeab962 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini +++ b/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini @@ -606,7 +606,7 @@ opt-set-cmake-var Trilinos_ENABLE_COMPLEX BOOL : OFF # [USE-FPIC|YES] -opt-set-cmake-var CMAKE_POSITION_INDEPENDENT_CODE BOOL : ON +# Nothing to do here. [USE-FPIC|NO] # Nothing to do here.