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.
use $(MAKE) in the makefile, so FreeBSD will use the right make tool (gmake) #1990
pull robbak wants to merge 3 commits into bitcoin:master from robbak:master changing 1 files +1 −1-
robbak commented at 12:09 PM on November 6, 2012: contributor
-
Alter make to $MAKE, to use the correct make line. 3267946d8d
-
Merge remote-tracking branch 'bitcoin/bitcoin' 2bf1d50127
-
Merge remote-tracking branch 'upstream/master' 0e7ef9aa07
-
Diapolo commented at 11:26 AM on November 10, 2012: none
@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.
git checkout "local branch"git fetch upstreamgit rebase upstreamgit push origin "local branch" -f
-
gavinandresen commented at 10:46 PM on November 10, 2012: contributor
Needs to be rebased into one commit, and the same change should be made to the other OS's Makefiles.
- robbak closed this on Nov 13, 2012
-
robbak commented at 12:11 AM on November 13, 2012: contributor
I've messed up my clone, so I'll do it again, the right way. Thanks.
- KolbyML referenced this in commit 027c036f0a on Dec 5, 2020
- KolbyML referenced this in commit 06b28f1854 on Dec 5, 2020
- DrahtBot locked this on Sep 8, 2021
Contributors