mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-29 19:47:38 +00:00
Auto merge of #65762 - mati865:msys2-bug, r=pietroalbini
workaround msys2 bug
This commit is contained in:
commit
10a52c25ca
@ -84,6 +84,17 @@ steps:
|
|||||||
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
|
||||||
displayName: Download custom MinGW
|
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`
|
# Otherwise install MinGW through `pacman`
|
||||||
- bash: |
|
- bash: |
|
||||||
set -e
|
set -e
|
||||||
@ -96,6 +107,18 @@ steps:
|
|||||||
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
|
||||||
displayName: Download standard MinGW
|
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
|
# 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
|
# 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
|
# baked in which break LLVM's build system one way or another, so let's use the
|
||||||
|
Loading…
Reference in New Issue
Block a user