diff options
| author | bors <bors@rust-lang.org> | 2022-01-12 17:57:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-12 17:57:50 +0000 |
| commit | 1bd4fdc943513e1004f498bbf289279c9784fc6f (patch) | |
| tree | 98e184cf410f6f6e4a029d070014e1443e0e23cd /src/ci/docker/scripts | |
| parent | 72e74d7b9cf1a7901650227e74650f1fcc797600 (diff) | |
| parent | 05dd1e4a2b6561b6daac38395883be6c782c2de1 (diff) | |
| download | rust-1bd4fdc943513e1004f498bbf289279c9784fc6f.tar.gz rust-1bd4fdc943513e1004f498bbf289279c9784fc6f.zip | |
Auto merge of #92811 - matthiaskrgr:rollup-wrctcef, r=matthiaskrgr
Rollup of 14 pull requests Successful merges: - #92328 (Tweak sentence in `transmute` docs) - #92432 (Error when selected impl is not const in constck) - #92506 (Document Box<T> FFI guarantee in 1.41.0 release notes) - #92699 (rustdoc: Display "private fields" instead of "fields omitted") - #92703 (RELEASES.md: Add 1.58 release note for `File::options` stabilization) - #92707 (Extended the note on the use of `no_run` attribute) - #92709 (Improve documentation for File::options to give a more likely example) - #92720 (Fix doc formatting for time.rs) - #92732 (Add note about upstream commit musl-patch-configure.diff is derived from) - #92742 (Add missing suffix for sidebar-items script path) - #92748 (Eliminate "boxed" wording in `std::error::Error` documentation) - #92754 (Update AsmArgs field visibility for rustfmt) - #92756 (:arrow_up: rust-analyzer) - #92764 (Fix rust logo style) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 3c17f316d1f..e358b8139d7 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -48,7 +48,9 @@ cd musl-cross-make git checkout a54eb56f33f255dfca60be045f12a5cfaf5a72a9 # Fix the cfi detection script in musl's configure so cfi is generated -# when debug info is asked for. +# when debug info is asked for. This patch is derived from +# https://git.musl-libc.org/cgit/musl/commit/?id=c4d4028dde90562f631edf559fbc42d8ec1b29de. +# When we upgrade to a version that includes this commit, we can remove the patch. mkdir patches/musl-1.1.24 cp ../musl-patch-configure.diff patches/musl-1.1.24/0001-fix-cfi-detection.diff |