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

Merge Makefiles #8862

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Merge Makefiles #8862

merged 3 commits into from
Dec 18, 2023

Conversation

kinke
Copy link
Contributor

@kinke kinke commented Dec 13, 2023

Depends on dlang/dmd#15894 + dlang/dmd#15920 (pushed as same-named DMD branch makefiles for CI), then seems to work already with these pretty minimal posix.mak adaptations (see first commit - review commit-by-commit). :)

For CI, this makes use of the special feature that branch CI pipelines (for branches pushed to the dlang repo) try to clone a same-named branch on the other dlang repo. So the relevant pipelines to look at are the branch pipelines, not the PR pipelines. For GitHub Actions, the branch pipeline jobs are displayed as (push) (vs. (pull_request)) here in the GUI; for Azure CI, it needs to be looked up manually.

@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 + phobos#8862"

@kinke kinke force-pushed the makefiles branch 14 times, most recently from dcad4cb to c36d113 Compare December 16, 2023 20:42
@kinke kinke changed the title WIP: Merge Makefiles Merge Makefiles Dec 16, 2023
@kinke
Copy link
Contributor Author

kinke commented Dec 16, 2023

Wrt. zlib (the only C parts of Phobos), the situation was a bit wild:

  • posix.mak compiled the 15 .c files directly, using the C compiler.
  • win*.mak had misleading rules for compiling .c files with DMD via importC, but was actually using etc/c/zlib/win{32,64}.mak, which was using the C compiler.

With the generic Makefile now, the files are compiled directly in there, using the C compiler for now. The zlib Makefiles are unused, and after seeing that they seem to be additions of ours (incl. {linux,osx}.mak) , not part of upstream https://github.com/madler/zlib/tree/v1.2.12, I've killed them with fire.

@thewilsonator
Copy link
Contributor

Dependant PR merged.

@kinke
Copy link
Contributor Author

kinke commented Dec 18, 2023

Thanks! - Landing this probably breaks Windows CI for DMD master, requiring dlang/dmd#15920 to land in tandem.

@kinke kinke marked this pull request as ready for review December 18, 2023 02:06
@ibuclaw ibuclaw merged commit 881cd47 into master Dec 18, 2023
19 of 20 checks passed
@ibuclaw ibuclaw deleted the makefiles branch December 18, 2023 09:27
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