File tree Expand file tree Collapse file tree 7 files changed +11
-11
lines changed Expand file tree Collapse file tree 7 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88
99export CONTAINER_NAME=ci_macos_cross
1010export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos
11- export HOST=x86_64-apple-darwin19
11+ export HOST=x86_64-apple-darwin
1212export PACKAGES=" cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
1313export XCODE_VERSION=12.1
1414export XCODE_BUILD_ID=12A7403
Original file line number Diff line number Diff line change 66
77export LC_ALL=C.UTF-8
88
9- export HOST=x86_64-apple-darwin19
9+ export HOST=x86_64-apple-darwin
1010export PIP_PACKAGES=" zmq lief"
1111export GOAL=" install"
1212export BITCOIN_CONFIG=" --with-gui --enable-reduce-exports"
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ crucial differences:
7575
76761 . Since only Windows and macOS build outputs require codesigning, the ` HOSTS `
7777 environment variable will have a sane default value of `x86_64-w64-mingw32
78- x86_64-apple-darwin19 ` instead of all the platforms.
78+ x86_64-apple-darwin ` instead of all the platforms.
79792 . The ` guix-codesign ` command *** requires*** a ` DETACHED_SIGS_REPO ` flag.
8080 * _ ** DETACHED_SIGS_REPO** _
8181
@@ -159,7 +159,7 @@ which case you can override the default list by setting the space-separated
159159` HOSTS ` environment variable:
160160
161161``` sh
162- env HOSTS=' x86_64-w64-mingw32 x86_64-apple-darwin19 ' ./contrib/guix/guix-build
162+ env HOSTS=' x86_64-w64-mingw32 x86_64-apple-darwin ' ./contrib/guix/guix-build
163163```
164164
165165See the [ recognized environment variables] [ env-vars-list ] section for more
@@ -224,7 +224,7 @@ details.
224224
225225 _ (defaults to "x86\_ 64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
226226 riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
227- x86\_ 64-w64-mingw32 x86\_ 64-apple-darwin19 ")_
227+ x86\_ 64-w64-mingw32 x86\_ 64-apple-darwin ")_
228228
229229* _ ** SOURCES_PATH** _
230230
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ mkdir -p "$VERSION_BASE"
7676# Default to building for all supported HOSTs (overridable by environment)
7777export HOSTS=" ${HOSTS:- x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
7878 x86_64-w64-mingw32
79- x86_64-apple-darwin19 } "
79+ x86_64-apple-darwin } "
8080
8181# Usage: distsrc_for_host HOST
8282#
Original file line number Diff line number Diff line change 9191# ###############
9292
9393# Default to building for all supported HOSTs (overridable by environment)
94- export HOSTS=" ${HOSTS:- x86_64-w64-mingw32 x86_64-apple-darwin19 } "
94+ export HOSTS=" ${HOSTS:- x86_64-w64-mingw32 x86_64-apple-darwin } "
9595
9696# Usage: distsrc_for_host HOST
9797#
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ case "$HOST" in
147147 #
148148 # After the native packages in depends are built, the ld wrapper should
149149 # no longer affect our build, as clang would instead reach for
150- # x86_64-apple-darwin19 -ld from cctools
150+ # x86_64-apple-darwin -ld from cctools
151151 ;;
152152 * ) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
153153esac
@@ -420,8 +420,8 @@ mkdir -p "$DISTSRC"
420420 find " ${DISTNAME} " -print0 \
421421 | sort --zero-terminated \
422422 | tar --create --no-recursion --mode=' u+rw,go+r-w,a+X' --null --files-from=- \
423- | gzip -9n > " ${OUTDIR} /${DISTNAME} -${HOST// x86_64-apple-darwin19 / osx64} .tar.gz" \
424- || ( rm -f " ${OUTDIR} /${DISTNAME} -${HOST// x86_64-apple-darwin19 / osx64} .tar.gz" && exit 1 )
423+ | gzip -9n > " ${OUTDIR} /${DISTNAME} -${HOST// x86_64-apple-darwin / osx64} .tar.gz" \
424+ || ( rm -f " ${OUTDIR} /${DISTNAME} -${HOST// x86_64-apple-darwin / osx64} .tar.gz" && exit 1 )
425425 ;;
426426 esac
427427 ) # $DISTSRC/installed
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ Common `host-platform-triplet`s for cross compilation are:
2828- ` i686-pc-linux-gnu ` for Linux 32 bit
2929- ` x86_64-pc-linux-gnu ` for x86 Linux
3030- ` x86_64-w64-mingw32 ` for Win64
31- - ` x86_64-apple-darwin19 ` for macOS
31+ - ` x86_64-apple-darwin ` for macOS
3232- ` arm-linux-gnueabihf ` for Linux ARM 32 bit
3333- ` aarch64-linux-gnu ` for Linux ARM 64 bit
3434- ` powerpc64-linux-gnu ` for Linux POWER 64-bit (big endian)
You can’t perform that action at this time.
0 commit comments