chore: cherry-pick 65d02a74d0c5 from chromium #47620
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VerteDinde
added
backport-check-skip
MarshallOfSound
approved these changes
Jun 30, 2025
VerteDinde
added
the
fast-track 🚅
ckerr
approved these changes
Jul 1, 2025
VerteDinde
force-pushed
the
cherry-pick/main/chromium/65d02a74d0c5
branch
from
99c5e88 to
17eb17c
Compare
VerteDinde
force-pushed
the
cherry-pick/main/chromium/65d02a74d0c5
branch
from
6c808f0 to
0775794
Compare
VerteDinde
removed
the
fast-track 🚅
electron-cation
bot
added
new-pr 🌱
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An upstream cherry-pick of https://chromium-review.googlesource.com/c/chromium/src/+/6691973 to help us unblock
mainfor now. This PR also downgrades us back to themacos-14GH runners.--
build: respect SDKROOT when finding local macOS SDK
By design xcode-select only outputs the location of xcode, whereas clang, xcodebuild, and other tools will respect SDKROOT when actually resolving the macOS SDK to use.
This retains current logic but augments it with an additional
xcrun --show-sdk-pathwhich fails open (if it fails we ignore it) to find any SDK that is being configured via the SDKROOT variable. This allows us to use any version of xcode while separately providing an absolute path to the correct SDK via the SDKROOT environment variable.Change-Id: I72b7ab557e107e7fd34968eaeaf24fb0705a9bbc
Notes: none