diff options
| author | Chris White <white238@llnl.gov> | 2023-07-04 04:52:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 07:52:59 -0400 |
| commit | 32d0b5ca97cf230fa068709e42e4d812612a4c62 (patch) | |
| tree | 408063cce06aa18ee249730a99a2370231da5f23 /var | |
| parent | b537fad37a5b198c7c5d581dedf08b59e48455c0 (diff) | |
| download | spack-32d0b5ca97cf230fa068709e42e4d812612a4c62.tar.gz spack-32d0b5ca97cf230fa068709e42e4d812612a4c62.tar.bz2 spack-32d0b5ca97cf230fa068709e42e4d812612a4c62.tar.xz spack-32d0b5ca97cf230fa068709e42e4d812612a4c62.zip | |
conduit: remove no longer needed blueos logic (#38698)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 0fe7b06f3a..cb6b5aefe1 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -410,31 +410,19 @@ class Conduit(CMakePackage): 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 |