* update

modflowpy · Jun 10, 2024 · 61971f5 · 61971f5
1 parent 628cba0
commit 61971f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/autotest/test_cli_cmds.py b/autotest/test_cli_cmds.py
@@ -4,7 +4,8 @@
 
 import pytest
 from flaky import flaky
-from modflow_devtools.misc import set_dir
+from modflow_devtools.misc import set_dir, set_env
+from platform import system
 
 RERUNS = 3
 
@@ -106,10 +107,14 @@ def test_mfpymake(function_tmpdir, meson: bool) -> None:
             "--verbose",
             "-fc",
         ]
+        fc = "gfortran"
         if os.environ.get("FC") is None:
-            cmd.append("gfortran")
+            cmd.append(fc)
         else:
-            cmd.append(os.environ.get("FC"))
+            fc = os.environ.get("FC")
+            cmd.append(fc)
+        if system() == "Darwin" and fc == "gfortran":
+            set_env(**{"LDFLAGS": "-Wl,-ld_classic"})
         if meson:
             cmd.append("--meson")
         run_cli_cmd(cmd)

diff --git a/autotest/test_gridgen.py b/autotest/test_gridgen.py
@@ -31,7 +31,7 @@ def pm(module_tmpdir, target) -> pymake.Pymake:
     pm.target = str(target)
     pm.appdir = str(module_tmpdir)
     pm.cc = environ.get("CXX", "g++")
-    pm.fc = environ.get("FC", "gfortran")
+    pm.fc = None
     if system() == "Darwin" and pm.cc == "g++":
         pm.syslibs = "-Wl,-ld_classic"
     pm.inplace = True