fix: Correctly resolve macOS SDK paths #2478
Open
Conversation
This file contains 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
aignas
reviewed
Dec 7, 2024
python/private/pypi/whl_library.bzl
Outdated
Comment on lines
58
to
83
| xcode_sdks_json = rctx.execute([ | ||
| "xcrun", | ||
| "xcodebuild", | ||
| "-showsdks", | ||
| "-json", | ||
| ], environment = { | ||
| "DEVELOPER_DIR": xcode_root, | ||
| }).stdout | ||
| xcode_sdks = json.decode(xcode_sdks_json) | ||
| potential_sdks = [ | ||
| sdk | ||
| for sdk in xcode_sdks | ||
| if "productName" in sdk and | ||
| sdk["productName"] == "macOS" and | ||
| "darwinos" not in sdk["canonicalName"] | ||
| ] | ||
|
|
||
| # Now we'll get two entries here (one for internal and another one for public) | ||
| # It shouldn't matter which one we pick. | ||
| xcode_sdk_path = potential_sdks[0]["sdkPath"] | ||
| else: | ||
| xcode_sdk_path = "{}/SDKs/MacOSX.sdk".format(xcode_root) |
There was a problem hiding this comment.
Thinking out loud, is this path absolute? I am wondering if we should have the path in the rules_python_internal where we then can include the path by importing it as a constant.
There was a problem hiding this comment.
This looks like it's absolute when I run the command on my machine.
python/private/pypi/whl_library.bzl
Outdated
| # | ||
| # We may want to build in an environment without a cc toolchain. | ||
| # In those cases, we're limited to --donwload-only, but we should respect that here. | ||
| if not rctx.attr.download_only: |
There was a problem hiding this comment.
Let's also exclude when the filename is specified and it is a whl.
rickeylev
requested changes
Dec 7, 2024
python/private/pypi/whl_library.bzl
Outdated
| @@ -55,9 +55,31 @@ def _get_xcode_location_cflags(rctx): | |||
| # This is a full xcode installation somewhere like /Applications/Xcode13.0.app/Contents/Developer | |||
| # so we need to change the path to to the macos specific tools which are in a different relative | |||
| # path than xcode installed command line tools. | |||
| xcode_root = "{}/Platforms/MacOSX.platform/Developer".format(xcode_root) | |||
| xcode_sdks_json = rctx.execute([ | |||
There was a problem hiding this comment.
Please use repo_utils.execute_checked from `//python/private:repo_utils.bzl. We have wrappers that do some book keeping to aid debugging etc. (See a few lines above for example)
There was a problem hiding this comment.
I had no idea that existed. How useful. Done!
XCode has facilities for accurately telling us where SDKs are installed. This is important to use, particularly when there may be multiple SDKs or versions of XCode installed.
shs96c
force-pushed
the
resolve-macos-sdks
branch
from
450fb76 to
f4c5b61
Compare
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.
XCode has facilities for accurately telling us where SDKs are installed. This is important to use, particularly when there may be multiple SDKs or versions of XCode installed.