diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 731355598cb13..870938cb52acf 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -75,12 +75,9 @@ mkdir -p "$VERSION_BASE" # Default to building for all supported HOSTs (overridable by environment) # powerpc64le-linux-gnu currently disabled due non-determinism issues across build arches. -# TODO: Re-enable macOS hosts. -# export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu -# x86_64-w64-mingw32 -# x86_64-apple-darwin arm64-apple-darwin}" export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu - x86_64-w64-mingw32}" + x86_64-w64-mingw32 + x86_64-apple-darwin arm64-apple-darwin}" # Usage: distsrc_for_host HOST # diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index ad189d591fc5c..ed47af6603f85 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -284,7 +284,7 @@ mkdir -p "$DISTSRC" # Install built Bitcoin Core to $INSTALLPATH case "$HOST" in *darwin*) - make install-strip DESTDIR="${INSTALLPATH}" ${V:+V=1} + cmake --install build --strip --prefix "${INSTALLPATH}" ${V:+--verbose} ;; *) cmake --install build --prefix "${INSTALLPATH}" ${V:+--verbose} @@ -293,13 +293,12 @@ mkdir -p "$DISTSRC" case "$HOST" in *darwin*) - make osx_volname ${V:+V=1} - make deploydir ${V:+V=1} + cmake --build build --target deploy ${V:+--verbose} + mv build/dist/Bitcoin-Core.zip "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip" mkdir -p "unsigned-app-${HOST}" cp --target-directory="unsigned-app-${HOST}" \ - osx_volname \ contrib/macdeploy/detached-sig-create.sh - mv --target-directory="unsigned-app-${HOST}" dist + mv --target-directory="unsigned-app-${HOST}" build/dist ( cd "unsigned-app-${HOST}" find . -print0 \ @@ -308,7 +307,6 @@ mkdir -p "$DISTSRC" | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \ || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 ) ) - make deploy ${V:+V=1} OSX_ZIP="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip" ;; esac ( @@ -389,7 +387,7 @@ mkdir -p "$DISTSRC" case "$HOST" in *mingw*) - cp -rf --target-directory=. "${DISTSRC}/contrib/windeploy" + cp -rf --target-directory=. contrib/windeploy ( cd ./windeploy mkdir -p unsigned