Skip to content

[Backport release-24.05] openbsd: init at 7.5#315687

Merged
Ericson2314 merged 6 commits intorelease-24.05from
backport-311836-to-release-24.05
May 30, 2024
Merged

[Backport release-24.05] openbsd: init at 7.5#315687
Ericson2314 merged 6 commits intorelease-24.05from
backport-311836-to-release-24.05

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to release-24.05, triggered by a label in #311836.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

Ericson2314 and others added 6 commits May 29, 2024 17:43
Co-authored-by: Rahul Butani <[email protected]>
(cherry picked from commit d9c9da5)
See: https://github.com/NixOS/nixpkgs/pull/246577/files#r1600650238

This code was breaking some thing for me, and I believe it was a
mistake. I hink we *do* wanna link libc, since libc++ depends on it, but
*don't* want to link an already-existing C++ standard library
implementation. `-nostdlib++` without `-nostdlib` therefore seems
correct to me.

Without this change, we do indeed fail to link OpenBSD.

(cherry picked from commit d0b08ab)
See the code comments for details

Also replace a bad hard-coded `freebsd` with a flexible `*` wildcard in
the `doFakeLibgcc` implementation.

(cherry picked from commit ad6fa01)
(cherry picked from commit 888dee4)
@github-actions github-actions bot mentioned this pull request May 29, 2024
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 29, 2024
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 29, 2024
@Ericson2314 Ericson2314 merged commit a7b0b30 into release-24.05 May 30, 2024
@Ericson2314 Ericson2314 deleted the backport-311836-to-release-24.05 branch May 30, 2024 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants