diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-01-12 07:12:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 07:12:14 +0100 |
| commit | eecdfe526febbc8b268ac2f409f9fc75add8841d (patch) | |
| tree | 651d5b42c0a7c97d40027d08ab1edd3b9692669e | |
| parent | 37f061a2f83c4c49c9699daf78eb0ef5ac943284 (diff) | |
| parent | 55abf38bf2d7a8c38dd15440cf7bb1a13b04bcb8 (diff) | |
| download | rust-eecdfe526febbc8b268ac2f409f9fc75add8841d.tar.gz rust-eecdfe526febbc8b268ac2f409f9fc75add8841d.zip | |
Rollup merge of #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.
| -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 |