File tree Expand file tree Collapse file tree 2 files changed +0
-16
lines changed Expand file tree Collapse file tree 2 files changed +0
-16
lines changed Original file line number Diff line number Diff line change @@ -8,14 +8,6 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
88if isWindows; then
99 pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar
1010
11- # FIXME(#65767): workaround msys bug, step 2
12- arch=i686
13- if [ " $MSYS_BITS " = " 64" ]; then
14- arch=x86_64
15- fi
16- pacman -U --noconfirm --noprogressbar mingw-w64-$arch -ca-certificates-20180409-1-any.pkg.tar.xz
17- rm mingw-w64-$arch -ca-certificates-20180409-1-any.pkg.tar.xz
18-
1911 # Make sure we use the native python interpreter instead of some msys equivalent
2012 # one way or another. The msys interpreters seem to have weird path conversions
2113 # baked in which break LLVM's build system one way or another, so let's use the
Original file line number Diff line number Diff line change 11#! /bin/bash
2- # ignore-tidy-linelength
32# Download and install MSYS2, needed primarily for the test suite (run-make) but
43# also used by the MinGW toolchain for assembling things.
54#
@@ -13,13 +12,6 @@ IFS=$'\n\t'
1312source " $( cd " $( dirname " $0 " ) " && pwd) /../shared.sh"
1413
1514if isWindows; then
16- # FIXME(#65767): workaround msys bug, step 1
17- arch=i686
18- if [ " $MSYS_BITS " = " 64" ]; then
19- arch=x86_64
20- fi
21- curl -O " ${MIRRORS_BASE} /msys2-repo/mingw/$arch /mingw-w64-$arch -ca-certificates-20180409-1-any.pkg.tar.xz"
22-
2315 choco install msys2 --params=" /InstallDir:${SYSTEM_WORKFOLDER} /msys2 /NoPath" -y --no-progress
2416 mkdir -p " ${SYSTEM_WORKFOLDER} /msys2/home/${USERNAME} "
2517
You can’t perform that action at this time.
0 commit comments