zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conduit: remove no longer needed blueos logic (#38698)

Browse Source
This commit is contained in:
Chris White
2023-07-04 04:52:59 -07:00
committed by GitHub
parent b537fad37a
commit 32d0b5ca97
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
var/spack/repos/builtin/packages/conduit/package.py
View File

@@ -410,31 +410,19 @@ def hostconfig(self):
cfg.write(cmake_cache_entry("ENABLE_TESTS", "OFF"))
# extra fun for blueos
if on_blueos:
# All of BlueOS compilers report clang due to nvcc,
# override to proper compiler family
if "xlc" in c_compiler:
cfg.write(cmake_cache_entry("CMAKE_C_COMPILER_ID", "XL"))
if "xlC" in cpp_compiler:
cfg.write(cmake_cache_entry("CMAKE_CXX_COMPILER_ID", "XL"))
if on_blueos and "+fortran" in spec and (f_compiler is not None) and ("xlf" in f_compiler):
# Fix missing std linker flag in xlc compiler
flags = "-WF,-C! -qxlf2003=polymorphic"
cfg.write(cmake_cache_entry("BLT_FORTRAN_FLAGS", flags))
# Grab lib directory for the current fortran compiler
libdir = os.path.join(os.path.dirname(os.path.dirname(f_compiler)), "lib")
rpaths = "-Wl,-rpath,{0} -Wl,-rpath,{0}64".format(libdir)
if "+fortran" in spec:
if "xlf" in f_compiler:
cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER_ID", "XL"))
if (f_compiler is not None) and ("xlf" in f_compiler):
# Fix missing std linker flag in xlc compiler
flags = "-WF,-C! -qxlf2003=polymorphic"
cfg.write(cmake_cache_entry("BLT_FORTRAN_FLAGS", flags))
# Grab lib directory for the current fortran compiler
libdir = os.path.join(os.path.dirname(os.path.dirname(f_compiler)), "lib")
rpaths = "-Wl,-rpath,{0} -Wl,-rpath,{0}64".format(libdir)
flags = "${BLT_EXE_LINKER_FLAGS} -lstdc++ " + rpaths
cfg.write(cmake_cache_entry("BLT_EXE_LINKER_FLAGS", flags))
if "+shared" in spec:
flags = "${CMAKE_SHARED_LINKER_FLAGS} " + rpaths
cfg.write(cmake_cache_entry("CMAKE_SHARED_LINKER_FLAGS", flags))
flags = "${BLT_EXE_LINKER_FLAGS} -lstdc++ " + rpaths
cfg.write(cmake_cache_entry("BLT_EXE_LINKER_FLAGS", flags))
if "+shared" in spec:
flags = "${CMAKE_SHARED_LINKER_FLAGS} " + rpaths
cfg.write(cmake_cache_entry("CMAKE_SHARED_LINKER_FLAGS", flags))
#######################
# Python