Skip to content

Commit 3cd3a2e

Browse files
committed
Update with libc system
1 parent f2a27a7 commit 3cd3a2e

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pr: ["master"]
1111

1212
jobs:
1313
- job: DockerLinux
14+
dependsOn: StyleAndDocs
1415
pool:
1516
vmImage: ubuntu-16.04
1617
steps:
@@ -160,6 +161,7 @@ jobs:
160161
CI: 1
161162

162163
- job: AutomaticVerification
164+
dependsOn: StyleAndDocs
163165
pool:
164166
vmImage: ubuntu-16.04
165167
steps:
@@ -168,6 +170,7 @@ jobs:
168170
displayName: Automatic verification
169171

170172
- job: GameBoyAdvance
173+
dependsOn: StyleAndDocs
171174
pool:
172175
vmImage: ubuntu-16.04
173176
steps:

ci/azure-install-rust.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,28 @@ steps:
3333
if defined TARGET rustup target add %TARGET%
3434
condition: eq( variables['Agent.OS'], 'Windows_NT' )
3535
displayName: Install target (windows)
36+
- script: |
37+
@echo on
38+
if "%ARCH%" == "i686" choco install mingw --x86 --force
39+
condition: eq( variables['Agent.OS'], 'Windows_NT' )
40+
displayName: Install MinGW32 (windows)
41+
- bash: |
42+
set -ex
43+
gcc -print-search-dirs
44+
find "C:\ProgramData\Chocolatey" -name "crt2*"
45+
find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
46+
find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
47+
condition: eq( variables['Agent.OS'], 'Windows_NT' )
48+
displayName: Find GCC libraries (windows)
49+
- bash: |
50+
set -ex
51+
if [[ -n ${ARCH_BITS} ]]; then
52+
for i in crt2.o dllcrt2.o libmsvcrt.a ; do
53+
cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw${ARCH_BITS}/${ARCH}-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/${TARGET}/lib"
54+
done
55+
fi
56+
condition: eq( variables['Agent.OS'], 'Windows_NT' )
57+
displayName: Fix MinGW (windows)
3658
- bash: |
3759
set -ex
3860
rustc -Vv
@@ -43,8 +65,12 @@ steps:
4365
which cargo
4466
which rustup
4567
displayName: Query rust and cargo versions
68+
- script: |
69+
@echo on
70+
where gcc
71+
condition: eq( variables['Agent.OS'], 'Windows_NT' )
72+
displayName: Query gcc path
4673
- bash: |
4774
set -ex
4875
cargo generate-lockfile
4976
displayName: Generate lockfiles
50-

0 commit comments

Comments
 (0)