summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMichael Kuhn <suraia@ikkoku.de>2017-05-19 19:03:56 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2017-05-19 12:03:56 -0500
commit571a42d6149faf88e5b49fa6d8d9bfa6c2b6c783 (patch)
treee760e24e884d6392361fd79c7d304a181edbd25a /var
parent8b47fe5a781ba73bd3a5d86e23b6debbd27cf625 (diff)
downloadspack-571a42d6149faf88e5b49fa6d8d9bfa6c2b6c783.tar.gz
spack-571a42d6149faf88e5b49fa6d8d9bfa6c2b6c783.tar.bz2
spack-571a42d6149faf88e5b49fa6d8d9bfa6c2b6c783.tar.xz
spack-571a42d6149faf88e5b49fa6d8d9bfa6c2b6c783.zip
Fix gcc not finding zlib (#4291)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gcc/package.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 893b8efce5..1bdee43e83 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -170,6 +170,15 @@ class Gcc(AutotoolsPackage):
'typedef void* dispatch_block_t',
new_header)
+ # Use installed libz
+ if self.version >= Version('6'):
+ filter_file('@zlibdir@',
+ '-L{0}'.format(spec['zlib'].prefix.lib),
+ 'gcc/Makefile.in')
+ filter_file('@zlibinc@',
+ '-I{0}'.format(spec['zlib'].prefix.include),
+ 'gcc/Makefile.in')
+
def configure_args(self):
spec = self.spec