Skip to content

Commit f5182fb

Browse files
committed
install arm64 tools for msys2?
1 parent c3cfd2b commit f5182fb

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

_build-runner.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@ if [ ! -f .cw-initialized ]; then
2323
extra=''
2424
case "$(uname)" in
2525
*_NT*)
26-
env='x86_64'
27-
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
28-
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
29-
zip
30-
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
31-
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
32-
mingw-w64-"${env}"-go
33-
if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
26+
for env in 'x86_64' 'clang-aarch64'; do
3427
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
35-
mingw-w64-"${env}"-nasm
36-
fi
28+
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
29+
zip
30+
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
31+
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
32+
mingw-w64-"${env}"-go
33+
if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
34+
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
35+
mingw-w64-"${env}"-nasm
36+
fi
37+
done
3738
;;
3839
Linux*)
3940
if [ -s /etc/os-release ]; then

_ci-win-msys2.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail
77

8-
env='x86_64'
9-
10-
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
11-
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
12-
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
13-
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
14-
zip
15-
16-
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
17-
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
18-
mingw-w64-"${env}"-go
8+
for env in 'x86_64' 'clang-aarch64'; do
9+
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
10+
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
11+
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
12+
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
13+
zip
1914

20-
if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
15+
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
2116
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
22-
mingw-w64-"${env}"-nasm
23-
fi
17+
mingw-w64-"${env}"-go
18+
19+
if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
20+
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
21+
mingw-w64-"${env}"-nasm
22+
fi
23+
done
2424

2525
./_build.sh

gen-keys/mk-cert-code.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail
2020
# brew install openssl gnupg osslsigncode coreutils diffutils
2121
# pip install base58
2222
# Windows:
23-
# pacman --sync openssl gnupg mingw-w64-x86_64-osslsigncode
23+
# pacman --sync openssl gnupg mingw-w64-{x86_64,clang-aarch64}-osslsigncode
2424
# sigcheck64.exe:
2525
# curl --user-agent '' --remote-name --remote-time --xattr https://live.sysinternals.com/tools/sigcheck64.exe
2626
# signtool.exe:

0 commit comments

Comments
 (0)