summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-03-25 16:47:48 +0100
committerDenis Davydov <davydden@gmail.com>2016-03-25 16:47:48 +0100
commit5172f09b9f966a3f1be438bab972a0267cccc73b (patch)
tree6ee23cf92c702c395da9a463313871a3c5dfcf79 /var
parent26a72619aed8684019ab331889b276b8883b76c8 (diff)
downloadspack-5172f09b9f966a3f1be438bab972a0267cccc73b.tar.gz
spack-5172f09b9f966a3f1be438bab972a0267cccc73b.tar.bz2
spack-5172f09b9f966a3f1be438bab972a0267cccc73b.tar.xz
spack-5172f09b9f966a3f1be438bab972a0267cccc73b.zip
builds on OSX again (modulo CC wrappers are solved)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index e077dfbbfd..3003b4ab53 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -113,15 +113,15 @@ class Trilinos(Package):
# FIXME:
# VerifyFortranC test of CMake does not contain -lgfortran and thus fails.
# This could be GCC/CMake related, but appears at least on OSX with Clang@7.0.2 and GNU Fortran@5.3.0
- if sys.platform == 'darwin':
- options.extend([
- '-DTrilinos_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=TRUE'
- ])
+ #if sys.platform == 'darwin':
+ # options.extend([
+ # '-DTrilinos_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=TRUE'
+ # ])
# for build-debug only:
- options.extend([
- '-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE'
- ])
+ #options.extend([
+ # '-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE'
+ #])
# suite-sparse related
if '+suite-sparse' in spec:
@@ -194,6 +194,11 @@ class Trilinos(Package):
'-DTrilinos_ENABLE_Pike=OFF',
'-DTrilinos_ENABLE_STK=OFF'
])
+ if sys.platform == 'darwin':
+ options.extend([
+ '-DTrilinos_ENABLE_FEI=OFF'
+ ])
+
with working_dir('spack-build', create=True):
cmake('..', *options)