[Backport release-23.11] bear: fix#291814
Merged
siraben merged 4 commits intorelease-23.11from Apr 12, 2024
Merged
Conversation
The previous build system patch was incomplete and left the `wrapper.d` directory empty, leaving Bear unable to pick up any build commands at all and breaking the functional test suite, which we also weren't running. Switch to overriding CMake flags instead and add the patches and dependencies necessary to get the functional tests running to prevent a future regression. I've checked that the instructions in Nix's `doc/manual/src/contributing/hacking.md` work after this change, which is what started this yak shave in the first place. (cherry picked from commit ec4de10)
(cherry picked from commit 3637fa5)
(cherry picked from commit 75a177b)
(cherry picked from commit 459e288)
ofborg
bot
added
10.rebuild-darwin: 1-10
babariviere
approved these changes
Feb 27, 2024
delroth
added
12.approvals: 1
Member
|
appears to fail on ofborg on Darwin due to some -X compiler flag getting included twice(?) |
Member
|
I couldn't figure out how to disable those tests. I think they're a red herring. The underlying binary does work on darwin (or at least, I've been using it on darwin from master nixpkgs even though those tests fail on darwin) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bot-based backport to
release-23.11, triggered by a label in #279035.