8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS#742
8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS#742gnu-andrew wants to merge 9 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back andrew! A progress list of the required criteria for merging this PR into |
|
@gnu-andrew This change now passes all automated pre-integration checks. 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
64c62cb to
f82b5ef
Compare
8d804e1 to
4e5afd4
Compare
|
@gnu-andrew Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
|
This is hard to review as-is (139 changed files). Best to integrate #738 and then do a merge from master and it should look better. |
|
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout JDK-8374948
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
Yes, the change itself is tiny, but obviously it needed all the dependencies so there was actually a Mac build to test it on. It should look better now. |
|
|
|
/approval request This fixes a bug in the saproc & jsig Makefiles on *BSD where the entire contents of LFLAGS were being added on Darwin only, rather than just what was required; the minimum MacOS version. This has gone unnoticed while the additional flags were just duplicates of flags already added by these Makefiles, but with the fix to add missing clang flags (JDK-8374899), it means a C++ compiler flag is being added to what is a C code build, causing a build failure. The change was reviewed by Severin Gehwolf and GHA testing shows this enables a working MacOS build there again. The risk is small, given it is specific to the build of the agent & jsig libraries on MacOS only, and manual verification of the build output from GHA shows that the same flags are still present from elsewhere. |
|
@gnu-andrew |
|
/approve yes |
|
@jerboaa |
|
/integrate |
|
Going to push as commit 08e617e. |
|
@gnu-andrew Pushed as commit 08e617e. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This patch breaks out the Mac minimum version argument into its own variable,
MAC_FLAGS, ingcc.make, so it can be added independently insaproc.makeandjsig.make. This prevents duplicate linker flags and C++-only flags being added to the C build for jsig and saproc.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/742/head:pull/742$ git checkout pull/742Update a local copy of the PR:
$ git checkout pull/742$ git pull https://git.openjdk.org/jdk8u-dev.git pull/742/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 742View PR using the GUI difftool:
$ git pr show -t 742Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/742.diff
Using Webrev
Link to Webrev Comment