Skip to content

Commit e5ce1f0

Browse files
Merge #6892: guix: adjust scripts to use SDK_SOURCES env variable properly
7d3e909 guix: adjust scripts to use `SDK_SOURCES` env variable properly (UdjinM6) Pull request description: ## Issue being fixed or feature implemented #6890 (review) ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: utACK 7d3e909 kwvg: utACK 7d3e909 Tree-SHA512: 3b69c34ad85ae946c58789a9fad37804db66b82e602434de8df15b3f47e6663d2ad4a65e763ae67a066a6b4d796899b588582939906f400fac543c917abd0f66
2 parents 7074278 + 7d3e909 commit e5ce1f0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

contrib/containers/guix/scripts/guix-start

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111

1212
if [[ -z "${HOSTS}" || "${HOSTS}" == *"darwin"* ]]; then
1313
export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
14-
export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}"
14+
export SDK_SOURCES="${SDK_SOURCES:-${WORKSPACE_PATH}/depends/sdk-sources}"
1515

1616
./contrib/containers/guix/scripts/setup-sdk
1717
fi

contrib/containers/guix/scripts/setup-sdk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ set -eo pipefail
99

1010
SDK_URL="${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}"
1111
SDK_PATH="${SDK_PATH:-depends/SDKs}"
12-
SDK_SRCS="${SDK_SOURCES:-depends/sdk-sources}"
12+
SDK_SOURCES="${SDK_SOURCES:-depends/sdk-sources}"
1313
XCODE_VERSION="${XCODE_VERSION:-15.0}"
1414
XCODE_RELEASE="${XCODE_RELEASE:-15A240d}"
1515
XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers"
16-
XCODE_AR_PATH="${SDK_SRCS}/${XCODE_ARCHIVE}.tar.gz"
16+
XCODE_AR_PATH="${SDK_SOURCES}/${XCODE_ARCHIVE}.tar.gz"
1717

1818
if [ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]; then
1919
if [ ! -f "${XCODE_AR_PATH}" ]; then
2020
echo "Downloading macOS SDK..."
21-
mkdir -p "${SDK_SRCS}"
21+
mkdir -p "${SDK_SOURCES}"
2222
curl --location --fail "${SDK_URL}/${XCODE_ARCHIVE}.tar.gz" -o "${XCODE_AR_PATH}"
2323
fi
2424
echo "Extracting macOS SDK..."

0 commit comments

Comments
 (0)