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

CI: Adapt to generic Makefile for Phobos #15920

Merged
merged 2 commits into from
Dec 18, 2023
Merged

CI: Adapt to generic Makefile for Phobos #15920

merged 2 commits into from
Dec 18, 2023

Conversation

kinke
Copy link
Contributor

@kinke kinke commented Dec 18, 2023

Depends on dlang/phobos#8862 (vice-versa).

@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @kinke! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the coverage diff by visiting the details link of the codecov check)
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "master + dmd#15920"

@@ -375,6 +375,8 @@ void setDefaultLibrary(ref Param params, const ref Target target)

if (driverParams.debuglibname is null)
driverParams.debuglibname = driverParams.defaultlibname;
else if (!driverParams.debuglibname.length) // if `-debuglib=` (i.e. an empty debuglib)
driverParams.debuglibname = null;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a slipstreamed fix for dmd -g -debuglib= foo.d causing an invalid /DEFAULTLIB: linker flag for link.exe, which complains about a missing name. The same logic is used for -defaultlib= a few lines up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(The Phobos Makefile specifies -defaultlib= -debuglib= to make sure no default Phobos library is linked.)

@thewilsonator thewilsonator merged commit 88d3f50 into master Dec 18, 2023
28 of 56 checks passed
@ibuclaw
Copy link
Member

ibuclaw commented Dec 18, 2023

Why was this merged without waiting for all pipelines to succeed?

@thewilsonator
Copy link
Contributor

#15920 (comment)

Because of a mutual two way dependance on dlang/phobos#8862 which you merged

@dkorpel dkorpel deleted the makefiles branch December 18, 2023 09:58
@ibuclaw
Copy link
Member

ibuclaw commented Dec 18, 2023

#15920 (comment)

Because of a mutual two way dependance on dlang/phobos#8862 which you merged

And then I retriggered CI here to confirm that was the case.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants