zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #222 from mplegendre/bugfix/github-203-gcc5-builds

Browse Source 
Fix issue with gcc 5.x not building on RHEL6
This commit is contained in:
Todd Gamblin 2015-12-07 15:55:21 -08:00
commit fcabf0ef0d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/packages/gcc/package.py
View File

@ -79,8 +79,9 @@ def install(self, spec, prefix):
"--with-gnu-as", "--with-gnu-as",
"--with-quad"] "--with-quad"]
# Binutils # Binutils
binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, static_bootstrap_flags = "-static-libstdc++ -static-libgcc"
"--with-boot-ldflags=%s" % self.rpath_args, 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-ld=%s/bin/ld" % spec['binutils'].prefix,
"--with-as=%s/bin/as" % spec['binutils'].prefix] "--with-as=%s/bin/as" % spec['binutils'].prefix]
options.extend(binutils_options) options.extend(binutils_options)
@ -89,7 +90,9 @@ def install(self, spec, prefix):
isl_options = ["--with-isl=%s" % spec['isl'].prefix] isl_options = ["--with-isl=%s" % spec['isl'].prefix]
options.extend(isl_options) options.extend(isl_options)
with working_dir('spack-build', create=True):
# Rest of install is straightforward. # Rest of install is straightforward.
configure = Executable('../configure')
configure(*options) configure(*options)
make() make()
make("install") make("install")