summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2019-12-22 16:19:12 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2019-12-22 16:19:12 -0600
commit3690bc44bd41e64d93d0aec418b68d51b01727ae (patch)
tree950a29f3005c689457fed19d522717f86ac16e8a /var
parentb83365c945f999b09247d4580e4e08578ce60da0 (diff)
downloadspack-3690bc44bd41e64d93d0aec418b68d51b01727ae.tar.gz
spack-3690bc44bd41e64d93d0aec418b68d51b01727ae.tar.bz2
spack-3690bc44bd41e64d93d0aec418b68d51b01727ae.tar.xz
spack-3690bc44bd41e64d93d0aec418b68d51b01727ae.zip
Set full xiar path when building cp2k with intel compiler (#14268)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cp2k/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index 4bccecf860..0cbcf8f56e 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -437,6 +437,7 @@ class Cp2k(MakefilePackage, CudaPackage):
mkf.write('CC = {0.compiler.cc}\n'.format(self))
if '%intel' in self.spec:
+ intel_bin_dir = ancestor(self.compiler.cc)
# CPP is a commented command in Intel arch of CP2K
# This is the hack through which cp2k developers avoid doing :
#
@@ -444,7 +445,7 @@ class Cp2k(MakefilePackage, CudaPackage):
#
# and use `-fpp` instead
mkf.write('CPP = # {0.compiler.cc} -P\n\n'.format(self))
- mkf.write('AR = xiar -r\n\n')
+ mkf.write('AR = {0}/xiar -r\n\n'.format(intel_bin_dir))
else:
mkf.write('CPP = # {0.compiler.cc} -E\n\n'.format(self))
mkf.write('AR = ar -r\n\n')