diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-10-13 15:49:18 +0200 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-10-13 07:49:18 -0600 |
| commit | b8c1ce43fa06c01463b524cfab438a9f653327a3 (patch) | |
| tree | eabadde593285c3e67e4323102a4946d7dd26046 | |
| parent | 9716a6f37f59e44cb4b9fcf862a72f66032b097d (diff) | |
| download | spack-b8c1ce43fa06c01463b524cfab438a9f653327a3.tar.gz spack-b8c1ce43fa06c01463b524cfab438a9f653327a3.tar.bz2 spack-b8c1ce43fa06c01463b524cfab438a9f653327a3.tar.xz spack-b8c1ce43fa06c01463b524cfab438a9f653327a3.zip | |
trilinos / oce : add missing if before calling macOS_version (#5743)
* trilinos: add missing if before calling macOS_version
* oce: add missing if before calling macOS_version
| -rw-r--r-- | var/spack/repos/builtin/packages/oce/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index 15bc9ab39e..c968eb1973 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -92,7 +92,8 @@ class Oce(Package): '-DOCE_OSX_USE_COCOA:BOOL=ON', ]) - if macOS_version() >= Version('10.12'): + if platform.system() == 'Darwin' and ( + macOS_version() >= Version('10.12')): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 784253158f..4262054690 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -586,7 +586,7 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_FEI=OFF' ]) - if macOS_version() >= Version('10.12'): + if sys.platform == 'darwin' and macOS_version() >= Version('10.12'): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: |