@@ -23,26 +23,8 @@ set -ex
2323# Make sure it is absolute and exported
2424export ARROW_HOME=" $( cd " ${ARROW_HOME} " && pwd) "
2525
26- # The RTools42 release (r-hub/rtools42) ships with 0-byte ca-bundle.crt files
27- # due to an MSYS2 build bug (msys2/msys2-installer#40). Regenerate them from
28- # the trust anchors that are already installed.
29- if [ ! -s /usr/ssl/certs/ca-bundle.crt ]; then
30- update-ca-trust
31- fi
32-
33- # The CI shell runs bash directly without --login, so MSYSTEM is unset and
34- # the ucrt64 toolchain isn't on PATH. Both are needed for makepkg-mingw.
35- export MSYSTEM=${MSYSTEM:- UCRT64}
36- export PATH=" /${MSYSTEM,,} /bin:$PATH "
37-
38- # RTools42's frozen MSYS2 keyring is too old for current mirror signatures.
39- pacman-key --init
40- pacman-key --populate msys2
4126pacman --noconfirm -Syy
4227
43- # RTools42's ucrt64 toolchain doesn't include strip; install it for makepkg-mingw.
44- pacman --noconfirm -S mingw-w64-ucrt-x86_64-binutils
45-
4628RWINLIB_LIB_DIR=" lib"
4729: ${MINGW_ARCH:= " mingw32 mingw64 ucrt64" }
4830
@@ -64,8 +46,8 @@ cd build
6446# This may vary by system/CI provider
6547MSYS_LIB_DIR=" /c/rtools${RTOOLS_VERSION} "
6648
67- # Untar the builds we made (RTools42+ uses zstd compression instead of xz)
68- ls * .zst * . xz 2> /dev/null | xargs -n 1 tar -xf
49+ # Untar the builds we made
50+ ls * .xz | xargs -n 1 tar -xJf
6951mkdir -p $DST_DIR
7052# Grab the headers from one, either one is fine
7153# (if we're building twice to combine old and new toolchains, this may already exist)
0 commit comments