Match up with the new binutils package file. It does what OSS needs w.r.t. libiberty.

1 files changed, 13 insertions, 10 deletions

diff --git a/var/spack/packages/binutils/package.py b/var/spack/packages/binutils/package.py
index 43a670585e..29b8de462b 100644
--- a/var/spack/packages/binutils/package.py
+++ b/var/spack/packages/binutils/package.py
@@ -13,19 +13,22 @@ class Binutils(Package):
     variant('krellpatch', default=False, description="build with openspeedshop based patch.")
     patch('binutilskrell-2.24.patch', when='@2.24+krellpatch')
 
+    variant('libiberty', default=False, description='Also install libiberty.')
+
     def install(self, spec, prefix):
 
-        # Add additional configuration options for use in the OpenSpeedShop project
-        if '+krellpatch' in spec:
-            configure('--prefix', self.prefix,
-                      '--libdir', self.prefix.lib,
-                      '--enable-shared',
-                      '--enable-install-libiberty',
-                      '--disable-multilib'
-                      )
-        else:
-            configure("--prefix=%s" % prefix)
+        configure_args = [
+            '--prefix=%s' % prefix,
+            '--disable-dependency-tracking',
+            '--enable-interwork',
+            '--enable-multilib',
+            '--enable-shared',
+            '--enable-64-bit-bfd',
+            '--enable-targets=all']
 
+        if '+libiberty' in spec:
+            configure_args.append('--enable-install-libiberty')
 
+        configure(*configure_args)
         make()
         make("install")