Skip to content

Commit 764893d

Browse files
Merge #6890: guix: avoid downloading macOS SDK for non-darwin target HOSTs
d0eb2b5 guix: avoid downloading macOS SDK for non-darwin target HOSTs (UdjinM6) Pull request description: ## Issue being fixed or feature implemented Save some time/bandwidth for non-darwin HOSTs. See windows build as an example: develop: https://github.com/UdjinM6/dash/actions/runs/18493165708/job/52692931975#step:7:78 this PR: https://github.com/UdjinM6/dash/actions/runs/18494088428/job/52720349586#step:7:76 ## What was done? ## How Has This Been Tested? https://github.com/UdjinM6/dash/actions/runs/18494088428 ## 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 d0eb2b5 Tree-SHA512: 90050e196402f4e4c785e867fa1143db4471c00715e8c73e2db57b3c779928a0abda0a93a3b992cc470b7b27a4f54d62f20e0e82bd4b3266956e41a7c3df6a9a
2 parents be20db0 + d0eb2b5 commit 764893d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

contrib/containers/guix/scripts/guix-start

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ if [[ ! -d "${WORKSPACE_PATH}" || ! "${WORKSPACE_PATH}" = /* || ! -f "${WORKSPAC
99
exit 1
1010
fi
1111

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

15-
./contrib/containers/guix/scripts/setup-sdk
16+
./contrib/containers/guix/scripts/setup-sdk
17+
fi
1618

1719
# Add safe.directory option only when WORKSPACE_PATH was specified via cmd-line arguments (happens in CI)
1820
if [[ -n "${1}" ]]; then

0 commit comments

Comments
 (0)