use $(MAKE) in the makefile, so FreeBSD will use the right make tool (gmake) #1990
Conversation
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
|
@robbak You should not merge upstream changes but rebase your pull onto current master. The way this pull is now it won't be accepted I think.
|
|
Needs to be rebased into one commit, and the same change should be made to the other OS's Makefiles. |
|
I've messed up my clone, so I'll do it again, the right way. |
KolbyML
pushed a commit
to KolbyML/bitcoin
that referenced
this pull request
Dec 5, 2020
8dfdb5d [Build] Pass proper commit range to linter (Fuzzbawls) Pull request description: fixes an issue with a stale variable in the lint part of GA ACKs for top commit: furszy: utACK 8dfdb5d random-zebra: ACK 8dfdb5d Tree-SHA512: c8d11eba7412957db61fe642db322caec7cb332a6cc70b56a797bcae9f6bcd6b89a0a43d5f73690c4b12b6140614128df3e6597eeed5d4898d0bcf632108a621
KolbyML
pushed a commit
to KolbyML/bitcoin
that referenced
this pull request
Dec 5, 2020
1bc95d1 Explicitly set lint job to run on ubuntu-18.04 (Fuzzbawls) cbc0f58 [Build] Re-work GA to properly set a PR's commit range (Fuzzbawls) d3fe1fe [Build] Ensure the apt mirrors are always up-to-date (Fuzzbawls) Pull request description: Instead of opening multiple pull requests to fixup the remaining issues with the GA workflow, i've condensed them here as follows: 1. GA doesn't update apt mirrors internally during initialization, so force this behavior ourselves to prevent intermittent apt package install issues 2. bitcoin#1990 was an incorrect fix, but it didn't result in a CI job error 3. don't use `ubuntu-latest` identifier as that is subject to change. ACKs for top commit: furszy: ACK 1bc95d1 Tree-SHA512: cc7ec096aa3a917befdc6938b05a635ceaf47f2e7d9bc1724cafdb401539e2d11fc5729d5a3bd2591953fadb28d40a0eab80f0bc2de25cb42e26370096c5e7f3
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
After the leveldb import, src/makefile.unix has the 'make' command for leveldb hard coded. When a build is run on FreeBSD, it uses the system make, which uses different syntaxes.
Using the macro $(MAKE) will cause it to run gmake, and the build will work.