zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go: fixed GOROOT_BOOTSTRAP without workarounds (#2671)

Browse Source
This commit is contained in:
Massimiliano Culpo 2016-12-25 21:33:57 +01:00 committed by Todd Gamblin
parent c3cd948537
commit 8fe5fb7988
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/go-bootstrap/package.py
View File

@ -87,5 +87,8 @@ def install(self, spec, prefix):
else: else:
shutil.copy2(f, os.path.join(prefix, f)) 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): def setup_environment(self, spack_env, run_env):
spack_env.set('GOROOT_FINAL', self.spec.prefix) spack_env.set('GOROOT_FINAL', self.spec.prefix)

11
var/spack/repos/builtin/packages/go/package.py
View File

@ -47,7 +47,7 @@
class Go(Package): class Go(Package):
"""The golang compiler and build environment""" """The golang compiler and build environment"""
homepage = "https://golang.org" 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 extendable = True
@ -104,14 +104,7 @@ def install(self, spec, prefix):
shutil.copy2(f, os.path.join(prefix, f)) shutil.copy2(f, os.path.join(prefix, f))
def setup_environment(self, spack_env, run_env): def setup_environment(self, spack_env, run_env):
try: spack_env.set('GOROOT_FINAL', self.spec.prefix)
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
def setup_dependent_package(self, module, ext_spec): def setup_dependent_package(self, module, ext_spec):
"""Called before go modules' install() methods. """Called before go modules' install() methods.