diff options
| author | Andrey Prokopenko <andrey.prok@gmail.com> | 2017-12-22 01:32:10 -0500 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2017-12-22 07:32:10 +0100 |
| commit | 937f68c3598e1f07f8154126bebc28e25263ab89 (patch) | |
| tree | 8991fad976b903efde11399bf8f593763ab90f6d /var | |
| parent | d1786779c4fa91cb728b6ea80984e7a4ffe94a4c (diff) | |
| download | spack-937f68c3598e1f07f8154126bebc28e25263ab89.tar.gz spack-937f68c3598e1f07f8154126bebc28e25263ab89.tar.bz2 spack-937f68c3598e1f07f8154126bebc28e25263ab89.tar.xz spack-937f68c3598e1f07f8154126bebc28e25263ab89.zip | |
clang,flang: update CC, CXX environment in installation module (#6737)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/flang/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index fb84e9841d..1b9d746087 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -80,3 +80,8 @@ class Flang(CMakePackage): out.close() chmod = which('chmod') chmod('+x', flang) + + def setup_environment(self, spack_env, run_env): + run_env.set('FC', join_path(self.spec.prefix.bin, 'flang')) + run_env.set('F77', join_path(self.spec.prefix.bin, 'flang')) + run_env.set('F90', join_path(self.spec.prefix.bin, 'flang')) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 48f767aa17..64045c2684 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -365,6 +365,10 @@ class Llvm(CMakePackage): def setup_environment(self, spack_env, run_env): spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) + if '+clang' in self.spec: + run_env.set('CC', join_path(self.spec.prefix.bin, 'clang')) + run_env.set('CXX', join_path(self.spec.prefix.bin, 'clang++')) + def cmake_args(self): spec = self.spec |