clang,flang: update CC, CXX environment in installation module (spack…

…#6737)
W3SS · Dec 22, 2017 · 937f68c · 937f68c
1 parent d178677
commit 937f68c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py
@@ -80,3 +80,8 @@ def post_install(self):
             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
@@ -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