From bb8bfda496c694fc03e77ed5b1760aa9882d5f9a Mon Sep 17 00:00:00 2001 From: Meagan Lang Date: Wed, 29 May 2024 19:43:36 -0400 Subject: [PATCH] Account for absence of --version flag for apple ar Remove --solver specification in conda build as mamba is the default --- utils/setup_test_env.py | 4 ++-- yggdrasil/drivers/CModelDriver.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/setup_test_env.py b/utils/setup_test_env.py index 3c170c7d3..d365d08b8 100644 --- a/utils/setup_test_env.py +++ b/utils/setup_test_env.py @@ -1185,8 +1185,8 @@ def build_conda_recipe(recipe='recipe', param=None, # else: conda_build = f"{CONDA_CMD} build" build_pkgs = ["conda-build", "conda-verify"] - if param.use_mamba: - build_flags += ' --solver=libmamba' + # if param.use_mamba: + # build_flags += ' --solver=libmamba' # Must always build in base to avoid errors (and don't change the # version of Python used in the environment) # https://github.com/conda/conda/issues/9124 diff --git a/yggdrasil/drivers/CModelDriver.py b/yggdrasil/drivers/CModelDriver.py index bc14ea451..1babb71e7 100755 --- a/yggdrasil/drivers/CModelDriver.py +++ b/yggdrasil/drivers/CModelDriver.py @@ -402,7 +402,8 @@ class ARArchiver(ArchiverBase): toolset = 'gnu' version_regex = [ r'(?PGNU ar \(.+\) \d+\.\d+(?:\.\d+)?' - r'(?:\-[\.0-9a-zA-Z]+)?)'] + r'(?:\-[\.0-9a-zA-Z]+)?)', + r'(?Par \-d \[\-TLsv\].+)'] compatible_toolsets = ['llvm'] search_path_envvar = ['LIBRARY_PATH']