Update to CICE-Consortium/main (2024-05-01) (NOAA-EMC#79)

* Update to CICE-Consortium (935 to 943)
DeniseWorthen · Jul 11, 2024 · 647fe55 · 647fe55
1 parent 4c0e08a
commit 647fe55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml
@@ -46,7 +46,6 @@ jobs:
         run: |
           sudo xcode-select -r
           sudo xcode-select -s /Library/Developer/CommandLineTools
-          sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/
           echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)"
           echo "xcode-select -p: $(xcode-select -p)"
       - name: system info
@@ -55,7 +54,7 @@ jobs:
           type wget
           type curl
           type csh
-          echo "readlink \$(which csh): $(python -c 'import os, sys; print os.path.realpath(sys.argv[1])' $(which csh))"
+          echo "readlink \$(which csh): $(python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' $(which csh))"
           echo "csh --version: $(csh --version)"
           echo "uname -a: $(uname -a)"
           echo "sw_vers: $(sw_vers)"

diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos
@@ -47,7 +47,8 @@ SDKPATH = $(shell xcrun --show-sdk-path)
 ifeq ($(strip $(SDKPATH)),)
   CFLAGS_HOST := 
 else
-  CFLAGS_HOST = -isysroot $(SDKPATH)
+  CFLAGS_HOST := -isysroot $(SDKPATH)
+  CFLAGS += -isysroot $(SDKPATH)
   LD += -L$(SDKPATH)/usr/lib
 endif