Merge pull request #1710 from LLNL/bugfix/chapman39/no-fortran-toss4_cray-build

add certain hip link flags whether or not fortran

Author: bmhan12

scripts/spack/packages/axom/package.py

@@ -378,23 +378,20 @@ def initconfig_hardware_entries(self):
             )
             hip_link_flags += "-lmpi_gtl_hsa "
 
+            if spec.satisfies("^[email protected]:"):
+                hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(rocm_root)
+            else:
+                hip_link_flags += "-L{0}/llvm/lib -Wl,-rpath,{0}/llvm/lib ".format(rocm_root)
+            # Only amdclang requires this path; cray compiler fails if this is included
+            if spec.satisfies("%llvm-amdgpu"):
+                hip_link_flags += "-L{0}/lib -Wl,-rpath,{0}/lib ".format(rocm_root)
+            hip_link_flags += "-lpgmath -lompstub "
+
             # Fixes for mpi for rocm until wrapper paths are fixed
             # These flags are already part of the wrapped compilers on TOSS4 systems
             if spec.satisfies("+fortran") and self.is_fortran_compiler("amdflang"):
-
                 hip_link_flags += "-Wl,--disable-new-dtags "
-
-                if spec.satisfies("^[email protected]:"):
-                    hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(
-                        rocm_root
-                    )
-                else:
-                    hip_link_flags += "-L{0}/llvm/lib -Wl,-rpath,{0}/llvm/lib ".format(rocm_root)
-
-                # Only amdclang requires this path; cray compiler fails if this is included
-                hip_link_flags += "-L{0}/lib -Wl,-rpath,{0}/lib ".format(rocm_root)
-
-                hip_link_flags += "-lpgmath -lflang -lflangrti -lompstub "
+                hip_link_flags += "-lflang -lflangrti "
 
             # Additional library path for cray compiler
             if self.spec.satisfies("%cce"):