diff options
| author | Matthew LeGendre <legendre1@llnl.gov> | 2015-12-07 15:49:47 -0800 |
|---|---|---|
| committer | Matthew LeGendre <legendre1@llnl.gov> | 2015-12-07 15:49:47 -0800 |
| commit | f8e046bb33b23890e1e3bf92866bd6ea5cefbbec (patch) | |
| tree | ac29035e1176c80751344ddfa93aa4479002d202 /var | |
| parent | 1a22a507d64f45f4aa2a1dae03604ba83cfb9736 (diff) | |
| download | spack-f8e046bb33b23890e1e3bf92866bd6ea5cefbbec.tar.gz spack-f8e046bb33b23890e1e3bf92866bd6ea5cefbbec.tar.bz2 spack-f8e046bb33b23890e1e3bf92866bd6ea5cefbbec.tar.xz spack-f8e046bb33b23890e1e3bf92866bd6ea5cefbbec.zip | |
Fix issue with gcc 5.x not building on RHEL6
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/gcc/package.py | 17 |
1 files changed, 10 insertions, 7 deletions
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() |