summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Diener <matthias.diener@gmail.com>2019-01-30 20:30:05 -0600
committerPeter Scheibel <scheibel1@llnl.gov>2019-01-30 20:30:05 -0600
commit3ce0fba036630b0f635dc1868a009de7c2ca0103 (patch)
treeb1060b6226653a7b33f382dd9fb4b83a26b5d7d8
parentbe38fded9b600bafa736da2b413edf5ae7c6fed0 (diff)
downloadspack-3ce0fba036630b0f635dc1868a009de7c2ca0103.tar.gz
spack-3ce0fba036630b0f635dc1868a009de7c2ca0103.tar.bz2
spack-3ce0fba036630b0f635dc1868a009de7c2ca0103.tar.xz
spack-3ce0fba036630b0f635dc1868a009de7c2ca0103.zip
go: fix directory structure issue for 1.11.5 (#10484)
-rw-r--r--var/spack/repos/builtin/packages/go/package.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
index 899b8a4e05..166a97acbe 100644
--- a/var/spack/repos/builtin/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -82,10 +82,17 @@ class Go(Package):
def install(self, spec, prefix):
bash = which('bash')
- with working_dir('src'):
+
+ wd = '.'
+
+ # 1.11.5 directory structure is slightly different
+ if self.version == Version('1.11.5'):
+ wd = 'go'
+
+ with working_dir(join_path(wd, 'src')):
bash('{0}.bash'.format('all' if self.run_tests else 'make'))
- install_tree('.', prefix)
+ install_tree(wd, prefix)
def setup_environment(self, spack_env, run_env):
spack_env.set('GOROOT_FINAL', self.spec.prefix)