From 3ce0fba036630b0f635dc1868a009de7c2ca0103 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 30 Jan 2019 20:30:05 -0600 Subject: go: fix directory structure issue for 1.11.5 (#10484) --- var/spack/repos/builtin/packages/go/package.py | 11 +++++++++-- 1 file 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) -- cgit v1.2.3-70-g09d2