-
Notifications
You must be signed in to change notification settings - Fork 232
8296904: Improve handling of macos xcode toolchain #931
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8296904: Improve handling of macos xcode toolchain #931
Conversation
|
👋 Welcome back clanger! A progress list of the required criteria for merging this PR into |
|
This backport pull request has now been updated with issue from the original commit. |
55c8877 to
a385c8f
Compare
MBaesken
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We always check TOOLCHAIN_PATH in basic.m4
UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
Shouldn't we do it similar to jdk/jdk ? There we check in case of DEVKIT_ROOT set, DEKIT_TOOLCHAIN_PATH. In case of TOOLCHAIN_PATH set we check TOOLCHAIN_PATH.
Hm, maybe yes. But in that case we should have a look at backporting JDK-8287254 entirely. For the current level of jdk17u, I would think this fits. |
|
Okay thanks for the explanation. Backporting JDK-8287254 is a bit too much for now (maybe later?). |
|
@RealCLanger This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 6 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
|
/integrate |
|
Going to push as commit 57e6d92.
Your commit was automatically rebased without conflicts. |
|
@RealCLanger Pushed as commit 57e6d92. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
I had to adapt the configure changes for the new option to the level of code in jdk17u.
Furthermore, I regenerated docs/building.html which brings it in sync with building.md and removes a change that should not have been made when backporting JDK-8280863.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/931/head:pull/931$ git checkout pull/931Update a local copy of the PR:
$ git checkout pull/931$ git pull https://git.openjdk.org/jdk17u-dev pull/931/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 931View PR using the GUI difftool:
$ git pr show -t 931Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/931.diff