summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2022-10-21 14:58:58 -0700
committerGitHub <noreply@github.com>2022-10-21 14:58:58 -0700
commit3fd097f1d536da23d8b9599755fae4385492e363 (patch)
tree7a97f7858e9a055b2eecb6dd51f88b77c9256629
parent9268b14f96f36b00d10ad5f1f6acd0ab83e06288 (diff)
downloadspack-3fd097f1d536da23d8b9599755fae4385492e363.tar.gz
spack-3fd097f1d536da23d8b9599755fae4385492e363.tar.bz2
spack-3fd097f1d536da23d8b9599755fae4385492e363.tar.xz
spack-3fd097f1d536da23d8b9599755fae4385492e363.zip
raja@0.14.0 +rocm: add -std=c++14 to HIP_HIPCC_FLAGS (#33456)
-rw-r--r--var/spack/repos/builtin/packages/raja/package.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index d185eb31fc..1f0bf93a67 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -133,12 +133,14 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
entries.append(cmake_cache_option("ENABLE_HIP", True))
entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
hip_repair_cache(entries, spec)
+ hipcc_flags = []
+ if self.spec.satisfies("@0.14.0"):
+ hipcc_flags.append("-std=c++14")
archs = self.spec.variants["amdgpu_target"].value
if archs != "none":
arch_str = ",".join(archs)
- entries.append(
- cmake_cache_string("HIP_HIPCC_FLAGS", "--amdgpu-target={0}".format(arch_str))
- )
+ hipcc_flags.append("--amdgpu-target={0}".format(arch_str))
+ entries.append(cmake_cache_string("HIP_HIPCC_FLAGS", " ".join(hipcc_flags)))
else:
entries.append(cmake_cache_option("ENABLE_HIP", False))