Merge pull request #48 from LLNL/bugfix/weiss27/uberenv-mac

Some updates for uberenv TPL setup on macos
LLNL · May 30, 2019 · 6c21792 · 6c21792
2 parents 870e32d + c5a13ea
commit 6c21792
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/scripts/uberenv/packages/raja/package.py b/scripts/uberenv/packages/raja/package.py
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack import *
+import os
 
 
 class Raja(CMakePackage):
@@ -26,7 +27,7 @@ def cmake_args(self):
 
         options = []
 
-        if 'bgq' in env["SYS_TYPE"]:
+        if 'bgq' in os.getenv('SYS_TYPE', ""):
             options.extend(['-DBLT_CXX_FLAGS=-stdlib=libc++'])
 
         if '+openmp' in spec:
@@ -41,4 +42,4 @@ def cmake_args(self):
                 '-DENABLE_CUDA=On',
                 '-DCUDA_TOOLKIT_ROOT_DIR=%s' % (spec['cuda'].prefix)])
 
-        return options
+        return options
diff --git a/scripts/uberenv/packages/umpire/package.py b/scripts/uberenv/packages/umpire/package.py
@@ -3,8 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
 from spack import *
+import os
 
 
 class Umpire(CMakePackage):
@@ -27,7 +27,7 @@ def cmake_args(self):
 
         options = []
 
-        if 'bgq' in env["SYS_TYPE"]:
+        if 'bgq' in os.getenv('SYS_TYPE', ""):
             options.extend(['-DENABLE_BENCHMARKS:BOOL=OFF', 
                             '-DENABLE_TESTS:BOOL=OFF',
                             '-DENABLE_EXAMPLES:BOOL=OFF',
@@ -44,4 +44,4 @@ def cmake_args(self):
         if '+fortran' in spec:
             options.append('-DENABLE_FORTRAN=On')
 
-        return options
+        return options
diff --git a/scripts/uberenv/spack_configs/darwin/compilers.yaml b/scripts/uberenv/spack_configs/darwin/compilers.yaml
@@ -23,3 +23,15 @@ compilers:
       f77: /usr/local/bin/gfortran
       fc: /usr/local/bin/gfortran
     spec: clang@9.0.0
+- compiler:
+    environment: {}
+    extra_rpaths: []
+    flags: {}
+    modules: []
+    operating_system: mojave
+    paths:
+      cc: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
+      cxx: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
+      f77: /usr/local/bin/gfortran
+      fc: /usr/local/bin/gfortran
+    spec: clang@10.0.0-apple