From 17f88f4bd2f822f91840c667adbf4ee391ed7026 Mon Sep 17 00:00:00 2001 From: ftuser Date: Thu, 1 Aug 2024 19:09:15 +0200 Subject: [PATCH] More osx fixes --- deploy/bootstrap.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/bootstrap.py b/deploy/bootstrap.py index 63cddd816..adf57ce8c 100755 --- a/deploy/bootstrap.py +++ b/deploy/bootstrap.py @@ -373,13 +373,14 @@ def build_jigsaw(activate_env, conda_base, source_path, env_path, logger): print('Building JIGSAW\n') # add build tools to deployment env, not polaris env - jigsaw_build_deps = 'cxx-compiler cmake' + jigsaw_build_deps = 'cxx-compiler cmake make' if platform.system() == 'Linux': jigsaw_build_deps = f'{jigsaw_build_deps} sysroot_linux-64=2.17' + netcdf_lib = f'{env_path}/lib/libnetcdf.so' elif platform.system() == 'Darwin': jigsaw_build_deps = \ f'{jigsaw_build_deps} macosx_deployment_target_osx-64=10.13' - netcdf_lib = f'{env_path}/lib/libnetcdf.so' + netcdf_lib = f'{env_path}/lib/libnetcdf.dylib' cmake_args = f'-DCMAKE_BUILD_TYPE=Release -DNETCDF_LIBRARY={netcdf_lib}' commands = \