File tree 2 files changed +0
-16
lines changed
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"
8
8
if isWindows; then
9
9
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar
10
10
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
-
19
11
# Make sure we use the native python interpreter instead of some msys equivalent
20
12
# one way or another. The msys interpreters seem to have weird path conversions
21
13
# 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 1
1
#! /bin/bash
2
- # ignore-tidy-linelength
3
2
# Download and install MSYS2, needed primarily for the test suite (run-make) but
4
3
# also used by the MinGW toolchain for assembling things.
5
4
#
@@ -13,13 +12,6 @@ IFS=$'\n\t'
13
12
source " $( cd " $( dirname " $0 " ) " && pwd) /../shared.sh"
14
13
15
14
if 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
-
23
15
choco install msys2 --params=" /InstallDir:${SYSTEM_WORKFOLDER} /msys2 /NoPath" -y --no-progress
24
16
mkdir -p " ${SYSTEM_WORKFOLDER} /msys2/home/${USERNAME} "
25
17
You can’t perform that action at this time.
0 commit comments