diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-02-09 13:11:26 -0800 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-02-09 13:22:53 -0800 |
| commit | fae9084ac5b10f94bdee54853d307838c4254e9c (patch) | |
| tree | 4f815c0ec9c8b6973776b1c3d984bb5ef8bbcfb0 | |
| parent | fa55a2554c2661b8f2a759044d5ac85c9979d9ca (diff) | |
build: Skip i686 build by default in guix and gitian
| -rw-r--r-- | contrib/gitian-descriptors/gitian-linux.yml | 2 | ||||
| -rw-r--r-- | contrib/guix/README.md | 2 | ||||
| -rwxr-xr-x | contrib/guix/guix-build.sh | 2 | ||||
| -rw-r--r-- | doc/release-process.md | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 257dd8ba30..4a8b125ae7 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -40,7 +40,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" + HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" FAKETIME_HOST_PROGS="gcc g++" FAKETIME_PROGS="date ar ranlib nm" diff --git a/contrib/guix/README.md b/contrib/guix/README.md index 46d755886c..8500379025 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -114,7 +114,7 @@ find output/ -type f -print0 | sort -z | xargs -r0 sha256sum * _**HOSTS**_ Override the space-separated list of platform triples for which to perform a - bootstrappable build. _(defaults to "i686-linux-gnu x86\_64-linux-gnu + bootstrappable build. _(defaults to "x86\_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu")_ > Windows and OS X platform triplet support are WIP. diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index 5e0c681f29..2daa8aba5e 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -20,7 +20,7 @@ time-machine() { } # Deterministically build Bitcoin Core for HOSTs (overriable by environment) -for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu}; do +for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu}; do # Display proper warning when the user interrupts the build trap 'echo "** INT received while building ${host}, you may want to clean up the relevant output and distsrc-* directories before rebuilding"' INT diff --git a/doc/release-process.md b/doc/release-process.md index 1ffef3e106..608f41cc6c 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -268,7 +268,6 @@ The list of files should be: ``` bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz -bitcoin-${VERSION}-i686-pc-linux-gnu.tar.gz bitcoin-${VERSION}-riscv64-linux-gnu.tar.gz bitcoin-${VERSION}-x86_64-linux-gnu.tar.gz bitcoin-${VERSION}-osx64.tar.gz |