Account for absence of --version flag for apple ar

Remove --solver specification in conda build as mamba is the default
cropsinsilico · May 29, 2024 · bb8bfda · bb8bfda
1 parent fba7a47
commit bb8bfda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -402,7 +402,8 @@ class ARArchiver(ArchiverBase):
     toolset = 'gnu'
     version_regex = [
         r'(?P<version>GNU ar \(.+\) \d+\.\d+(?:\.\d+)?'
-        r'(?:\-[\.0-9a-zA-Z]+)?)']
+        r'(?:\-[\.0-9a-zA-Z]+)?)',
+        r'(?P<version>ar \-d \[\-TLsv\].+)']
     compatible_toolsets = ['llvm']
     search_path_envvar = ['LIBRARY_PATH']