Skip to content

Commit

Permalink
Auto merge of #65762 - mati865:msys2-bug, r=pietroalbini
Browse files Browse the repository at this point in the history
workaround msys2 bug
  • Loading branch information
bors committed Oct 24, 2019
2 parents 8e0007f + 2fea525 commit 10a52c2
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions src/ci/azure-pipelines/steps/install-windows-build-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ steps:
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
displayName: Download custom MinGW

# FIXME(#65767): workaround msys bug, step 1
- bash: |
set -e
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
curl -O https://ci-mirrors.rust-lang.org/rustc/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
displayName: Download working ca-certificates for msys

# Otherwise install MinGW through `pacman`
- bash: |
set -e
Expand All @@ -96,6 +107,18 @@ steps:
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
displayName: Download standard MinGW

# FIXME(#65767): workaround msys bug, step 2
- bash: |
set -e
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
displayName: Install working ca-certificates for msys

# Make sure we use the native python interpreter instead of some msys equivalent
# one way or another. The msys interpreters seem to have weird path conversions
# baked in which break LLVM's build system one way or another, so let's use the
Expand Down

0 comments on commit 10a52c2

Please sign in to comment.