From f8e046bb33b23890e1e3bf92866bd6ea5cefbbec Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Mon, 7 Dec 2015 15:49:47 -0800 Subject: Fix issue with gcc 5.x not building on RHEL6 --- var/spack/packages/gcc/package.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/packages/gcc/package.py b/var/spack/packages/gcc/package.py index a49a1348aa..f58c1bd416 100644 --- a/var/spack/packages/gcc/package.py +++ b/var/spack/packages/gcc/package.py @@ -79,8 +79,9 @@ class Gcc(Package): "--with-gnu-as", "--with-quad"] # Binutils - binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, - "--with-boot-ldflags=%s" % self.rpath_args, + static_bootstrap_flags = "-static-libstdc++ -static-libgcc" + binutils_options = ["--with-stage1-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags), + "--with-boot-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags), "--with-ld=%s/bin/ld" % spec['binutils'].prefix, "--with-as=%s/bin/as" % spec['binutils'].prefix] options.extend(binutils_options) @@ -89,11 +90,13 @@ class Gcc(Package): isl_options = ["--with-isl=%s" % spec['isl'].prefix] options.extend(isl_options) - # Rest of install is straightforward. - configure(*options) - make() - make("install") - + with working_dir('spack-build', create=True): + # Rest of install is straightforward. + configure = Executable('../configure') + configure(*options) + make() + make("install") + self.write_rpath_specs() -- cgit v1.2.3-70-g09d2