summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorlukebroskop <luke.roskop@hpe.com>2021-05-07 19:16:13 -0500
committerGitHub <noreply@github.com>2021-05-07 17:16:13 -0700
commitdaebf5caf89969e99331896f4d285bb7bfa5e198 (patch)
tree6182f177294c59fcb6b5e1119b434eda6c84cd15 /var
parenteb273f5c2f1bc954c1637258cc5a8f3d695c11d1 (diff)
downloadspack-daebf5caf89969e99331896f4d285bb7bfa5e198.tar.gz
spack-daebf5caf89969e99331896f4d285bb7bfa5e198.tar.bz2
spack-daebf5caf89969e99331896f4d285bb7bfa5e198.tar.xz
spack-daebf5caf89969e99331896f4d285bb7bfa5e198.zip
craype fix for pdt (#23505)
* craype fix for pdt adapt the pdt package for cce * fix style issues
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/pdt/cray_configure.patch14
-rw-r--r--var/spack/repos/builtin/packages/pdt/package.py4
2 files changed, 18 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/pdt/cray_configure.patch b/var/spack/repos/builtin/packages/pdt/cray_configure.patch
new file mode 100644
index 0000000000..1c6a4a373d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/pdt/cray_configure.patch
@@ -0,0 +1,14 @@
+--- a/configure 2019-05-13 21:57:59.000000000 -0500
++++ b/configure 2021-03-04 10:09:56.612397173 -0600
+@@ -98,6 +98,11 @@
+ ARCH=CRAYXMT
+ PLATFORM=crayxmt
+ echo "Looks like a Cray XMT machine..."
++ elif [ -r /opt/cray ]
++ then
++ ARCH=CRAY
++ PLATFORM=x86_64
++ echo "Looks like a Cray machine..."
+ else
+ ARCH=X86_64
+ PLATFORM=x86_64
diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py
index 2322251e87..32678012f6 100644
--- a/var/spack/repos/builtin/packages/pdt/package.py
+++ b/var/spack/repos/builtin/packages/pdt/package.py
@@ -32,6 +32,8 @@ class Pdt(AutotoolsPackage):
variant('pic', default=False, description="Builds with pic")
+ patch('cray_configure.patch', when='%cce')
+
def patch(self):
spec = self.spec
if spec.satisfies('%clang') or spec.satisfies('%apple-clang'):
@@ -50,6 +52,8 @@ class Pdt(AutotoolsPackage):
options.append('-GNU')
elif self.compiler.name == 'clang':
options.append('-clang')
+ elif self.compiler.name == 'cce':
+ options.append('-CC')
else:
raise InstallError('Unknown/unsupported compiler family')