Skip to content
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

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Nov 25, 2022

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8296904: Improve handling of macos xcode toolchain

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/931/head:pull/931
$ git checkout pull/931

Update a local copy of the PR:
$ git checkout pull/931
$ git pull https://git.openjdk.org/jdk17u-dev pull/931/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 931

View PR using the GUI difftool:
$ git pr show -t 931

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/931.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 25, 2022

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 470f3424fcce0e41b75cccdd5e3a56771cd07ff5 8296904: Improve handling of macos xcode toolchain Nov 25, 2022
@openjdk
Copy link

openjdk bot commented Nov 25, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Nov 25, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 25, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2022

Webrevs

Copy link
Member

@MBaesken MBaesken left a 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.

@RealCLanger
Copy link
Contributor Author

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.

@MBaesken
Copy link
Member

Okay thanks for the explanation. Backporting JDK-8287254 is a bit too much for now (maybe later?).

@openjdk
Copy link

openjdk bot commented Nov 25, 2022

@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:

8296904: Improve handling of macos xcode toolchain

Reviewed-by: mbaesken

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 master branch:

  • 44c8733: 8295405: Add cause in a couple of IllegalArgumentException and InvalidParameterException shown by sun/security/pkcs11 tests
  • 22ad409: 8295952: Problemlist existing compiler/rtm tests also on x86
  • 8ed9f83: 8270086: ARM32-softfp: Do not load CONSTANT_double using the condy helper methods in the interpreter
  • aec0884: 8296960: [JVMCI] list HotSpotConstantPool.loadReferencedType to ConstantPool
  • 20f2218: 8296961: [JVMCI] Access to j.l.r.Method/Constructor/Field for ResolvedJavaMethod/ResolvedJavaField
  • 4c87089: 8297147: UnexpectedSourceImageSize test times out on slow machines when fastdebug is used

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 25, 2022
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 9, 2022

Going to push as commit 57e6d92.
Since your change was applied there have been 25 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 9, 2022
@openjdk openjdk bot closed this Dec 9, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 9, 2022
@openjdk
Copy link

openjdk bot commented Dec 9, 2022

@RealCLanger Pushed as commit 57e6d92.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@RealCLanger RealCLanger deleted the RealCLanger-backport-470f3424 branch December 9, 2022 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants