From b8c1ce43fa06c01463b524cfab438a9f653327a3 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 13 Oct 2017 15:49:18 +0200 Subject: 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 --- var/spack/repos/builtin/packages/oce/package.py | 3 ++- 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: -- cgit v1.2.3-70-g09d2