diff options
| author | fanquake <fanquake@gmail.com> | 2020-02-11 16:10:34 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-02-11 16:32:17 +0800 |
| commit | 98264e2ccb177a6603fe957f7e263fb413b50d04 (patch) | |
| tree | 74814037fc17cb26f79051904a962cad9ec1aaf9 /depends | |
| parent | 35b7a8e539fae30b0d0bc0ae4a3a994091626cbe (diff) | |
| parent | fae9084ac5b10f94bdee54853d307838c4254e9c (diff) | |
Merge #18104: build: Skip i686 build by default in guix and gitian
fae9084ac5b10f94bdee54853d307838c4254e9c build: Skip i686 build by default in guix and gitian (MarcoFalke)
fa55a2554c2661b8f2a759044d5ac85c9979d9ca depends: Remove reference to win32 (MarcoFalke)
Pull request description:
Closes #17504
Now that we no longer provide downloads for i686 on our website (https://bitcoincore.org/en/download/), there is no need to build them by default.
i686 can still be built in depends (tested by ci/travis) and in guix/gitian by setting the appropriate `HOSTS`.
ACKs for top commit:
practicalswift:
ACK fae9084ac5b10f94bdee54853d307838c4254e9c -- patch looks correct
dongcarl:
ACK fae9084ac5b10f94bdee54853d307838c4254e9c patch looks correct
laanwj:
Code review ACK fae9084ac5b10f94bdee54853d307838c4254e9c
hebasto:
ACK fae9084ac5b10f94bdee54853d307838c4254e9c, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: b000c19a2cd2a596a52028fa298c4022c24cfdfc1bdb3795a90916d0a00a32e4dd22278db93790b6a11724e08ea8451f4f05c77bc40d1664518e11a8c82d6e29
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/README.md b/depends/README.md index 93f619983f..9461887a33 100644 --- a/depends/README.md +++ b/depends/README.md @@ -46,7 +46,7 @@ The paths are automatically configured and no other options are needed unless ta sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools -#### For Win32/Win64 cross compilation +#### For Win64 cross compilation - see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux) |