diff options
author | Matthew LeGendre <legendre1@llnl.gov> | 2015-03-30 14:23:02 -0700 |
---|---|---|
committer | Matthew LeGendre <legendre1@llnl.gov> | 2015-03-30 14:23:02 -0700 |
commit | 89731d4a7df137f4406f2b19c9822ea59510a6e7 (patch) | |
tree | f7fef2d9ee10cb4f1fafad2d168858fab00fe074 | |
parent | 2b9dd718aed88d7ff5d17e70d761cfae871ad5ce (diff) | |
download | spack-89731d4a7df137f4406f2b19c9822ea59510a6e7.tar.gz spack-89731d4a7df137f4406f2b19c9822ea59510a6e7.tar.bz2 spack-89731d4a7df137f4406f2b19c9822ea59510a6e7.tar.xz spack-89731d4a7df137f4406f2b19c9822ea59510a6e7.zip |
Add binutils as a gcc dependency so it doesn't use the system linker/assembler.
-rw-r--r-- | var/spack/packages/binutils/package.py | 17 | ||||
-rw-r--r-- | var/spack/packages/gcc/package.py | 5 |
2 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/packages/binutils/package.py b/var/spack/packages/binutils/package.py new file mode 100644 index 0000000000..5a3059bbcf --- /dev/null +++ b/var/spack/packages/binutils/package.py @@ -0,0 +1,17 @@ +from spack import * + +class Binutils(Package): + """GNU binutils, which contain the linker, assembler, objdump and others""" + homepage = "http://www.gnu.org/software/binutils/" + url = "ftp://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2" + + version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66') + version('2.24', 'e0f71a7b2ddab0f8612336ac81d9636b') + version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') + version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') + + def install(self, spec, prefix): + configure("--prefix=%s" % prefix) + + make() + make("install") diff --git a/var/spack/packages/gcc/package.py b/var/spack/packages/gcc/package.py index 3da6c25d47..5e3d1a3efa 100644 --- a/var/spack/packages/gcc/package.py +++ b/var/spack/packages/gcc/package.py @@ -47,6 +47,7 @@ class Gcc(Package): depends_on("gmp") depends_on("mpc") # when @4.5: depends_on("libelf") + depends_on("binutils") # Save these until we can do optional deps. #depends_on("isl") @@ -73,6 +74,10 @@ class Gcc(Package): "--with-stage1-ldflags=%s" % self.rpath_args, "--with-boot-ldflags=%s" % self.rpath_args, "--enable-lto", + "--with-gnu-ld", + "--with-ld=%s/bin/ld" % spec['binutils'].prefix, + "--with-gnu-as", + "--with-as=%s/bin/as" % spec['binutils'].prefix, "--with-quad") make() make("install") |