Fix gcc not finding zlib (#4291)

2017-05-19 19:03:56 +02:00
parent 8b47fe5a78
commit 571a42d614
1 changed files with 9 additions and 0 deletions
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -170,6 +170,15 @@ def patch(self):
                            '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