Commit 2f356a0 1 parent 64059b7 commit 2f356a0 Copy full SHA for 2f356a0
File tree 7 files changed +11
-11
lines changed
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
8
8
9
9
export CONTAINER_NAME=ci_macos_cross
10
10
export 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
12
12
export PACKAGES=" cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
13
13
export XCODE_VERSION=12.1
14
14
export XCODE_BUILD_ID=12A7403
Original file line number Diff line number Diff line change 6
6
7
7
export LC_ALL=C.UTF-8
8
8
9
- export HOST=x86_64-apple-darwin19
9
+ export HOST=x86_64-apple-darwin
10
10
export PIP_PACKAGES=" zmq lief"
11
11
export GOAL=" install"
12
12
export BITCOIN_CONFIG=" --with-gui --enable-reduce-exports"
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ crucial differences:
75
75
76
76
1 . Since only Windows and macOS build outputs require codesigning, the ` HOSTS `
77
77
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.
79
79
2 . The ` guix-codesign ` command *** requires*** a ` DETACHED_SIGS_REPO ` flag.
80
80
* _ ** DETACHED_SIGS_REPO** _
81
81
@@ -159,7 +159,7 @@ which case you can override the default list by setting the space-separated
159
159
` HOSTS ` environment variable:
160
160
161
161
``` 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
163
163
```
164
164
165
165
See the [ recognized environment variables] [ env-vars-list ] section for more
@@ -224,7 +224,7 @@ details.
224
224
225
225
_ (defaults to "x86\_ 64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
226
226
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 ")_
228
228
229
229
* _ ** SOURCES_PATH** _
230
230
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ mkdir -p "$VERSION_BASE"
76
76
# Default to building for all supported HOSTs (overridable by environment)
77
77
export HOSTS=" ${HOSTS:- x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
78
78
x86_64-w64-mingw32
79
- x86_64-apple-darwin19 } "
79
+ x86_64-apple-darwin } "
80
80
81
81
# Usage: distsrc_for_host HOST
82
82
#
Original file line number Diff line number Diff line change 91
91
# ###############
92
92
93
93
# 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 } "
95
95
96
96
# Usage: distsrc_for_host HOST
97
97
#
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ case "$HOST" in
147
147
#
148
148
# After the native packages in depends are built, the ld wrapper should
149
149
# 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
151
151
;;
152
152
* ) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
153
153
esac
@@ -420,8 +420,8 @@ mkdir -p "$DISTSRC"
420
420
find " ${DISTNAME} " -print0 \
421
421
| sort --zero-terminated \
422
422
| 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 )
425
425
;;
426
426
esac
427
427
) # $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:
28
28
- ` i686-pc-linux-gnu ` for Linux 32 bit
29
29
- ` x86_64-pc-linux-gnu ` for x86 Linux
30
30
- ` x86_64-w64-mingw32 ` for Win64
31
- - ` x86_64-apple-darwin19 ` for macOS
31
+ - ` x86_64-apple-darwin ` for macOS
32
32
- ` arm-linux-gnueabihf ` for Linux ARM 32 bit
33
33
- ` aarch64-linux-gnu ` for Linux ARM 64 bit
34
34
- ` powerpc64-linux-gnu ` for Linux POWER 64-bit (big endian)
You can’t perform that action at this time.
0 commit comments