aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-08-10 22:20:22 +0800
committerfanquake <fanquake@gmail.com>2020-08-10 22:39:11 +0800
commit6d5a9fec2d576bdb17ff612e421a8c94dc362fbe (patch)
treeaf58e105f97192efabc72b4a2ecb4368af6cfca4 /doc
parent04a0676b3fbf435067831a5c2f512f181e276fed (diff)
parent01cd24c22606408d5c0ac74c9a2c5d85eff77846 (diff)
downloadbitcoin-6d5a9fec2d576bdb17ff612e421a8c94dc362fbe.tar.xz
Merge #19605: doc: set CC_FOR_BUILD when building on OpenBSD
01cd24c22606408d5c0ac74c9a2c5d85eff77846 doc: set CC_FOR_BUILD when building on OpenBSD (fanquake) Pull request description: Closes: #19559 While #19559 has been fixed upstream, it makes sense to not only recommend using `CC_FOR_BUILD`here until the fix is pulled in as part of our next libsecp update, but after discussing with Cory, he suggested we should be setting this on OpenBSD (which still has the an ancient GCC) regardless. ACKs for top commit: real-or-random: ACK 01cd24c22606408d5c0ac74c9a2c5d85eff77846 I looked at the diff (but can't test the instructions on OpenBSD) laanwj: Code review ACK 01cd24c22606408d5c0ac74c9a2c5d85eff77846 Tree-SHA512: 322802b9303771f1be2ad9628f268dfa71dc7ee77948fa2a34f21eceb19b2d8efdd8876c8f0778adbfcde48fa0f88cd4e698ae425428159abca38e8c7980da1d
Diffstat (limited to 'doc')
-rw-r--r--doc/build-openbsd.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 53c647ae34..584ee43d48 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,6 +1,6 @@
OpenBSD build guide
======================
-(updated for OpenBSD 6.4)
+(updated for OpenBSD 6.7)
This guide describes how to build bitcoind and command-line utilities on OpenBSD.
@@ -15,7 +15,7 @@ Run the following as root to install the base dependencies for building:
pkg_add git gmake libevent libtool boost
pkg_add autoconf # (select highest version, e.g. 2.69)
pkg_add automake # (select highest version, e.g. 1.16)
-pkg_add python # (select highest version, e.g. 3.6)
+pkg_add python # (select highest version, e.g. 3.8)
git clone https://github.com/bitcoin/bitcoin.git
```
@@ -23,10 +23,10 @@ git clone https://github.com/bitcoin/bitcoin.git
See [dependencies.md](dependencies.md) for a complete overview.
**Important**: From OpenBSD 6.2 onwards a C++11-supporting clang compiler is
-part of the base image, and while building it is necessary to make sure that this
-compiler is used and not ancient g++ 4.2.1. This is done by appending
-`CC=cc CXX=c++` to configuration commands. Mixing different compilers
-within the same executable will result in linker errors.
+part of the base image, and while building it is necessary to make sure that
+this compiler is used and not ancient g++ 4.2.1. This is done by appending
+`CC=cc CC_FOR_BUILD=cc CXX=c++` to configuration commands. Mixing different
+compilers within the same executable will result in errors.
### Building BerkeleyDB
@@ -77,7 +77,7 @@ To configure with wallet:
To configure without wallet:
```bash
-./configure --disable-wallet --with-gui=no CC=cc CXX=c++ MAKE=gmake
+./configure --disable-wallet --with-gui=no CC=cc CC_FOR_BUILD=cc CXX=c++ MAKE=gmake
```
Build and run the tests: