Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 23f8f65

Browse filesBrowse files
borsbors
committed
Auto merge of #65708 - Mark-Simulacrum:beta-backports, r=pietroalbini
[beta] backport rollup This includes a bunch of PRs: * Fix redundant semicolon lint interaction with proc macro attributes #64387 * Upgrade async/await to "used" keywords. #64875 * syntax: fix dropping of attribute on first param of non-method assocated fn #64894 * async/await: improve not-send errors #64895 * Silence unreachable code lint from await desugaring #64930 * Always mark rust and rust-call abi's as unwind #65020 * Account for macro invocation in `let mut $pat` diagnostic. #65123 * Ensure that associated `async fn`s have unique fresh param names #65142 * Add troubleshooting section to PGO chapter in rustc book. #65402 * Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302 * Optimize `try_expand_impl_trait_type` #65293 * use precalculated dominators in explain_borrow #65172 * Fix ICE #64964 #64989 * [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273 * save-analysis: Don't ICE when resolving qualified type paths in struct members #65353 * save-analysis: Nest tables when processing impl block definitions #65511 * Avoid ICE when checking `Destination` of `break` inside a closure #65518 * Avoid ICE when adjusting bad self ty #65755 * workaround msys2 bug #65762
2 parents 224f0bc + 4aa1e7a commit 23f8f65
Copy full SHA for 23f8f65

File tree

Expand file treeCollapse file tree

84 files changed

+2020
-745
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

84 files changed

+2020
-745
lines changed

‎src/ci/azure-pipelines/steps/install-windows-build-deps.yml

Copy file name to clipboardExpand all lines: src/ci/azure-pipelines/steps/install-windows-build-deps.yml
+23Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ steps:
8484
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
8585
displayName: Download custom MinGW
8686

87+
# FIXME(#65767): workaround msys bug, step 1
88+
- bash: |
89+
set -e
90+
arch=i686
91+
if [ "$MSYS_BITS" = "64" ]; then
92+
arch=x86_64
93+
fi
94+
curl -O https://ci-mirrors.rust-lang.org/rustc/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
95+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
96+
displayName: Download working ca-certificates for msys
97+
8798
# Otherwise install MinGW through `pacman`
8899
- bash: |
89100
set -e
@@ -96,6 +107,18 @@ steps:
96107
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
97108
displayName: Download standard MinGW
98109

110+
# FIXME(#65767): workaround msys bug, step 2
111+
- bash: |
112+
set -e
113+
arch=i686
114+
if [ "$MSYS_BITS" = "64" ]; then
115+
arch=x86_64
116+
fi
117+
pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
118+
rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
119+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
120+
displayName: Install working ca-certificates for msys
121+
99122
# Make sure we use the native python interpreter instead of some msys equivalent
100123
# one way or another. The msys interpreters seem to have weird path conversions
101124
# baked in which break LLVM's build system one way or another, so let's use the

‎src/ci/docker/README.md

Copy file name to clipboardExpand all lines: src/ci/docker/README.md
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,17 @@ For targets: `arm-unknown-linux-gnueabihf`
165165
For targets: `armv7-unknown-linux-gnueabihf`
166166
167167
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
168-
- Path and misc options > Patches origin = Bundled, then local
169-
- Path and misc options > Local patch directory = /tmp/patches
168+
- Path and misc options > Patches origin = Bundled only
170169
- Target options > Target Architecture = arm
171170
- Target options > Suffix to the arch-part = v7
172171
- Target options > Architecture level = armv7-a -- (+)
173172
- Target options > Use specific FPU = vfpv3-d16 -- (\*)
174173
- Target options > Floating point = hardware (FPU) -- (\*)
175174
- Target options > Default instruction set mode = thumb -- (\*)
176175
- Operating System > Target OS = linux
177-
- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
178-
- C-library > glibc version = 2.16.0
179-
- C compiler > gcc version = 5.2.0
176+
- Operating System > Linux kernel version = 3.2.101
177+
- C-library > glibc version = 2.17.0
178+
- C compiler > gcc version = 8.3.0
180179
- C compiler > C++ = ENABLE -- to cross compile LLVM
181180
182181
(\*) These options have been selected to match the configuration of the arm

‎src/ci/docker/dist-armv7-linux/Dockerfile

Copy file name to clipboardExpand all lines: src/ci/docker/dist-armv7-linux/Dockerfile
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,14 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
# Ubuntu 16.04 (this container) ships with make 4, but something in the
7-
# toolchains we build below chokes on that, so go back to make 3
8-
COPY scripts/make3.sh /scripts/
9-
RUN sh /scripts/make3.sh
10-
11-
COPY scripts/crosstool-ng.sh /scripts/
6+
COPY dist-armv7-linux/crosstool-ng.sh /scripts/
127
RUN sh /scripts/crosstool-ng.sh
138

149
COPY scripts/rustbuild-setup.sh /scripts/
1510
RUN sh /scripts/rustbuild-setup.sh
1611
USER rustbuild
1712
WORKDIR /tmp
1813

19-
COPY dist-armv7-linux/patches/ /tmp/patches/
2014
COPY dist-armv7-linux/build-toolchains.sh dist-armv7-linux/armv7-linux-gnueabihf.config /tmp/
2115
RUN ./build-toolchains.sh
2216

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.