From 2732565c6c944f0bff5a681d507a3dc5d5a99237 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 13:13:21 -0600 Subject: [PATCH] test ghactions --- .github/workflows/test-cice.yml | 1 + configuration/scripts/machines/Macros.conda_macos | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 9fb27a6cd..42e4ca14d 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -50,6 +50,7 @@ jobs: echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" export SDKROOT=$(xcrun --show-sdk-path) + echo "SDKROOT: $SDKROOT" - name: system info shell: /bin/bash {0} run: | diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 6f26da0fc..f8b95aa76 100644 --- 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