From 8fe5fb79887ab5c68fe9c5bd90dd6560e93c16ad Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 25 Dec 2016 21:33:57 +0100 Subject: go: fixed GOROOT_BOOTSTRAP without workarounds (#2671) --- var/spack/repos/builtin/packages/go-bootstrap/package.py | 3 +++ 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. -- cgit v1.2.3-60-g2f50