summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-10-17 17:03:49 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2015-10-17 17:04:34 -0700
commit44ba16a391d75f97bab9ebf0a8f1b609b18aba1d (patch)
tree63b70c6d62e5dc3bfa0aedd4ce4cbd6e7b72df1a /var
parentfe76e0aea230b6dabb01e4bb9e7e671161a01904 (diff)
downloadspack-44ba16a391d75f97bab9ebf0a8f1b609b18aba1d.tar.gz
spack-44ba16a391d75f97bab9ebf0a8f1b609b18aba1d.tar.bz2
spack-44ba16a391d75f97bab9ebf0a8f1b609b18aba1d.tar.xz
spack-44ba16a391d75f97bab9ebf0a8f1b609b18aba1d.zip
Add libiberty option to binutils
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/binutils/package.py14
-rw-r--r--var/spack/packages/gcc/package.py2
2 files changed, 14 insertions, 2 deletions
diff --git a/var/spack/packages/binutils/package.py b/var/spack/packages/binutils/package.py
index 5a3059bbcf..0c33bf0426 100644
--- a/var/spack/packages/binutils/package.py
+++ b/var/spack/packages/binutils/package.py
@@ -10,8 +10,20 @@ class Binutils(Package):
version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e')
version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764')
+ variant('libiberty', default=False, description='Also install libiberty.')
+
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix)
+ configure_args = [
+ '--prefix=%s' % prefix,
+ '--disable-dependency-tracking',
+ '--enable-interwork',
+ '--enable-multilib',
+ '--enable-64-bit-bfd',
+ '--enable-targets=all']
+
+ if '+libiberty' in spec:
+ configure_args.append('--enable-install-libiberty')
+ configure(*configure_args)
make()
make("install")
diff --git a/var/spack/packages/gcc/package.py b/var/spack/packages/gcc/package.py
index 5e3d1a3efa..2fc6794b70 100644
--- a/var/spack/packages/gcc/package.py
+++ b/var/spack/packages/gcc/package.py
@@ -47,7 +47,7 @@ class Gcc(Package):
depends_on("gmp")
depends_on("mpc") # when @4.5:
depends_on("libelf")
- depends_on("binutils")
+ depends_on("binutils~libiberty")
# Save these until we can do optional deps.
#depends_on("isl")