Skip to content

8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS#742

Closed
gnu-andrew wants to merge 9 commits intoopenjdk:masterfrom
gnu-andrew:JDK-8374948
Closed

8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS#742
gnu-andrew wants to merge 9 commits intoopenjdk:masterfrom
gnu-andrew:JDK-8374948

Conversation

@gnu-andrew
Copy link
Copy Markdown
Member

@gnu-andrew gnu-andrew commented Jan 10, 2026

This patch breaks out the Mac minimum version argument into its own variable, MAC_FLAGS, in gcc.make, so it can be added independently in saproc.make and jsig.make. This prevents duplicate linker flags and C++-only flags being added to the C build for jsig and saproc.


Progress

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

Issue

  • JDK-8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 742

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@gnu-andrew gnu-andrew marked this pull request as ready for review January 10, 2026 20:22
@bridgekeeper
Copy link
Copy Markdown

bridgekeeper bot commented Jan 10, 2026

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

@openjdk
Copy link
Copy Markdown

openjdk bot commented Jan 10, 2026

@gnu-andrew This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8374948: [8u] saproc & jsig builds add duplicate linker flags on Darwin/MacOS

Reviewed-by: sgehwolf

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 master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 rfr Pull request is ready for review label Jan 10, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge bot commented Jan 10, 2026

Webrevs

@gnu-andrew gnu-andrew mentioned this pull request Jan 12, 2026
4 tasks
@gnu-andrew gnu-andrew changed the base branch from pr/740 to pr/738 January 13, 2026 13:41
@openjdk
Copy link
Copy Markdown

openjdk bot commented Jan 13, 2026

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

@jerboaa
Copy link
Copy Markdown
Contributor

jerboaa commented Feb 3, 2026

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.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/738 to master February 3, 2026 17:43
@openjdk-notifier
Copy link
Copy Markdown

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

@gnu-andrew
Copy link
Copy Markdown
Member Author

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.

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.

Copy link
Copy Markdown
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk
Copy link
Copy Markdown

openjdk bot commented Feb 3, 2026

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Copy Markdown
Member Author

/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.

@openjdk
Copy link
Copy Markdown

openjdk bot commented Feb 3, 2026

@gnu-andrew
8374948: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Feb 3, 2026
@jerboaa
Copy link
Copy Markdown
Contributor

jerboaa commented Feb 3, 2026

/approve yes

@openjdk
Copy link
Copy Markdown

openjdk bot commented Feb 3, 2026

@jerboaa
8374948: The approval request has been approved.

@gnu-andrew
Copy link
Copy Markdown
Member Author

/integrate

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Feb 3, 2026
@openjdk
Copy link
Copy Markdown

openjdk bot commented Feb 3, 2026

Going to push as commit 08e617e.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 3, 2026
@openjdk openjdk bot closed this Feb 3, 2026
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 3, 2026
@openjdk
Copy link
Copy Markdown

openjdk bot commented Feb 3, 2026

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants