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

Should fix #177

Browse Source 
gcc : changed objdir to something out of srcdir and added '--with-sysroot=/'
binutils : added '--with-sysroot=/'
This commit is contained in:
alalazo 2015-12-08 09:57:07 +01:00
parent e7ab8d476d
commit c5b9732aed
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/packages/binutils/package.py
View File

@ -20,7 +20,8 @@ def install(self, spec, prefix):
'--enable-multilib', '--enable-multilib',
'--enable-shared', '--enable-shared',
'--enable-64-bit-bfd', '--enable-64-bit-bfd',
'--enable-targets=all'] '--enable-targets=all',
'--with-sysroot=/']
if '+libiberty' in spec: if '+libiberty' in spec:
configure_args.append('--enable-install-libiberty') configure_args.append('--enable-install-libiberty')

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

@ -38,6 +38,7 @@ class Gcc(Package):
DEPENDS_ON_ISL_PREDICATE = '@5.0:' DEPENDS_ON_ISL_PREDICATE = '@5.0:'
version('5.3.0', 'c9616fd448f980259c31de613e575719')
version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467') version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467')
version('4.9.3', '6f831b4d251872736e8e9cc09746f327') version('4.9.3', '6f831b4d251872736e8e9cc09746f327')
version('4.9.2', '4df8ee253b7f3863ad0b86359cd39c43') version('4.9.2', '4df8ee253b7f3863ad0b86359cd39c43')
@ -80,7 +81,8 @@ def install(self, spec, prefix):
"--with-quad"] "--with-quad"]
# Binutils # Binutils
static_bootstrap_flags = "-static-libstdc++ -static-libgcc" static_bootstrap_flags = "-static-libstdc++ -static-libgcc"
binutils_options = ["--with-stage1-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags), binutils_options = ["--with-sysroot=/",
"--with-stage1-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags),
"--with-boot-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]
@ -90,9 +92,10 @@ 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): build_dir = join_path(self.stage.path, 'spack-build')
configure = Executable( join_path(self.stage.source_path, 'configure') )
with working_dir(build_dir, 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")