From 3690bc44bd41e64d93d0aec418b68d51b01727ae Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Sun, 22 Dec 2019 16:19:12 -0600 Subject: Set full xiar path when building cp2k with intel compiler (#14268) --- var/spack/repos/builtin/packages/cp2k/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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') -- cgit v1.2.3-70-g09d2