summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-04-21 18:25:14 +0200
committerGitHub <noreply@github.com>2021-04-21 10:25:14 -0600
commitfebeca2b0544199580d50d822d982a31c8801995 (patch)
tree95539b0a18408e5b8cdfb26a20afef6a3700ce34
parenta97ef832d90158cde81b74e29a0cd90d3df66f4c (diff)
downloadspack-febeca2b0544199580d50d822d982a31c8801995.tar.gz
spack-febeca2b0544199580d50d822d982a31c8801995.tar.bz2
spack-febeca2b0544199580d50d822d982a31c8801995.tar.xz
spack-febeca2b0544199580d50d822d982a31c8801995.zip
Fix GCC with zstd on CCentOS 7 where it doesn't consider the lib64 directory (#23169)
-rw-r--r--var/spack/repos/builtin/packages/gcc/package.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 4314b70a5b..c1f5393bf1 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -464,7 +464,10 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
options.append('--with-system-zlib')
if 'zstd' in spec:
- options.append('--with-zstd={0}'.format(spec['zstd'].prefix))
+ options.append('--with-zstd-include={0}'.format(
+ spec['zstd'].headers.directories[0]))
+ options.append('--with-zstd-lib={0}'.format(
+ spec['zstd'].libs.directories[0]))
# Enabling language "jit" requires --enable-host-shared.
if 'languages=jit' in spec: