Skip to content

Commit d362337

Browse files
authored
Rollup merge of rust-lang#92732 - wesleywiser:note_musl_patch_info, r=Mark-Simulacrum
Add note about upstream commit musl-patch-configure.diff is derived from The patch landed in upstream over the weekend so I'm adding a note so we can more easily track when our patch file can be removed.
2 parents 2383d92 + 55abf38 commit d362337

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/docker/scripts/musl-toolchain.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ cd musl-cross-make
4848
git checkout a54eb56f33f255dfca60be045f12a5cfaf5a72a9
4949

5050
# Fix the cfi detection script in musl's configure so cfi is generated
51-
# when debug info is asked for.
51+
# when debug info is asked for. This patch is derived from
52+
# https://git.musl-libc.org/cgit/musl/commit/?id=c4d4028dde90562f631edf559fbc42d8ec1b29de.
53+
# When we upgrade to a version that includes this commit, we can remove the patch.
5254
mkdir patches/musl-1.1.24
5355
cp ../musl-patch-configure.diff patches/musl-1.1.24/0001-fix-cfi-detection.diff
5456

0 commit comments

Comments
 (0)