diff options
| author | Carl Dong <contact@carldong.me> | 2021-02-04 14:11:28 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-02-19 11:29:56 -0500 |
| commit | 5e6df1132656995ce5b9ce279d5a9808ea52ab32 (patch) | |
| tree | d9e0d480a87106df69f27d2a0f251685e40f0c0f /contrib | |
| parent | c46fe4d1073cd220b55ec8d55da2605529ea57a5 (diff) | |
| download | bitcoin-5e6df1132656995ce5b9ce279d5a9808ea52ab32.tar.xz | |
guix: Add support for powerpc64{,le}
The new time-machine commit contains a few small changes that make the
powerpc cross-toolchain work.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/guix/guix-build.sh | 4 | ||||
| -rw-r--r-- | contrib/guix/libexec/build.sh | 18 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 5 |
3 files changed, 18 insertions, 9 deletions
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index f29ea9b910..3b9030682a 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -69,7 +69,7 @@ fi ################ # Default to building for all supported HOSTs (overridable by environment) -export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu +export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu x86_64-w64-mingw32 x86_64-apple-darwin18}" @@ -148,7 +148,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" time-machine() { # shellcheck disable=SC2086 guix time-machine --url=https://github.com/dongcarl/guix.git \ - --commit=7d6bd44da57926e0d4af25eba723a61c82beef98 \ + --commit=6c9d16db962a6f7155571b36eced681fd2889e23 \ --max-jobs="$MAX_JOBS" \ --keep-failed \ ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \ diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 24bc30e330..72588c54a7 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -136,12 +136,14 @@ case "$HOST" in *linux*) glibc_dynamic_linker=$( case "$HOST" in - i686-linux-gnu) echo /lib/ld-linux.so.2 ;; - x86_64-linux-gnu) echo /lib64/ld-linux-x86-64.so.2 ;; - arm-linux-gnueabihf) echo /lib/ld-linux-armhf.so.3 ;; - aarch64-linux-gnu) echo /lib/ld-linux-aarch64.so.1 ;; - riscv64-linux-gnu) echo /lib/ld-linux-riscv64-lp64d.so.1 ;; - *) exit 1 ;; + i686-linux-gnu) echo /lib/ld-linux.so.2 ;; + x86_64-linux-gnu) echo /lib64/ld-linux-x86-64.so.2 ;; + arm-linux-gnueabihf) echo /lib/ld-linux-armhf.so.3 ;; + aarch64-linux-gnu) echo /lib/ld-linux-aarch64.so.1 ;; + riscv64-linux-gnu) echo /lib/ld-linux-riscv64-lp64d.so.1 ;; + powerpc64-linux-gnu) echo /lib/ld64.so.1;; + powerpc64le-linux-gnu) echo /lib/ld64.so.2;; + *) exit 1 ;; esac ) ;; @@ -231,6 +233,10 @@ case "$HOST" in *mingw*) HOST_LDFLAGS="-Wl,--no-insert-timestamp" ;; esac +case "$HOST" in + powerpc64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;; +esac + # Make $HOST-specific native binaries from depends available in $PATH export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" mkdir -p "$DISTSRC" diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index bf02fbfd1d..fb585b7f25 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -233,7 +233,10 @@ chain for " target " development.")) (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-nsis-with-sde-support nsis-x86_64))) ((string-contains target "riscv64-linux-") - (list (make-bitcoin-cross-toolchain "riscv64-linux-gnu" + (list (make-bitcoin-cross-toolchain target + #:base-gcc-for-libc gcc-7))) + ((string-contains target "powerpc64le-linux-") + (list (make-bitcoin-cross-toolchain target #:base-gcc-for-libc gcc-7))) ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) |