diff options
author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-12-25 21:33:57 +0100 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-12-25 12:33:57 -0800 |
commit | 8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad (patch) | |
tree | 656cd3f074abc00da2ca14d0b949a9db3d3ad5db | |
parent | c3cd948537dc357d4a5e227e9c2f8e85a7a7342d (diff) | |
download | spack-8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad.tar.gz spack-8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad.tar.bz2 spack-8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad.tar.xz spack-8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad.zip |
go: fixed GOROOT_BOOTSTRAP without workarounds (#2671)
-rw-r--r-- | var/spack/repos/builtin/packages/go-bootstrap/package.py | 3 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/go/package.py | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 77a074e809..050feab24d 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -87,5 +87,8 @@ class GoBootstrap(Package): else: shutil.copy2(f, os.path.join(prefix, f)) + def setup_dependent_environment(self, spack_env, run_env, dep_spec): + spack_env.set('GOROOT_BOOTSTRAP', self.spec.prefix) + def setup_environment(self, spack_env, run_env): spack_env.set('GOROOT_FINAL', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index cfd03ec355..2d797a3734 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -47,7 +47,7 @@ from spack import * class Go(Package): """The golang compiler and build environment""" homepage = "https://golang.org" - url='https://storage.googleapis.com/golang/go1.7.4.src.tar.gz' + url = 'https://storage.googleapis.com/golang/go1.7.4.src.tar.gz' extendable = True @@ -104,14 +104,7 @@ class Go(Package): shutil.copy2(f, os.path.join(prefix, f)) def setup_environment(self, spack_env, run_env): - try: - spack_env.set('GOROOT_FINAL', self.spec.prefix) - spack_env.set('GOROOT_BOOTSTRAP', self.spec['go-bootstrap'].prefix) - except KeyError: - # Needed because we try to get a build-only - # dependency, and this may fail during module - # file creation - pass + spack_env.set('GOROOT_FINAL', self.spec.prefix) def setup_dependent_package(self, module, ext_spec): """Called before go modules' install() methods. |