diff options
| author | Wesley Wiser <wesleywiser@microsoft.com> | 2022-01-10 10:41:31 -0500 |
|---|---|---|
| committer | Wesley Wiser <wesleywiser@microsoft.com> | 2022-01-10 10:41:31 -0500 |
| commit | 55abf38bf2d7a8c38dd15440cf7bb1a13b04bcb8 (patch) | |
| tree | a273ea31c2f9c6db0f4200aa510fa38be2f9bc1e /src/ci/docker | |
| parent | 89b9f7b284aacc5f8613438b80e4dd7bdd10549e (diff) | |
| download | rust-55abf38bf2d7a8c38dd15440cf7bb1a13b04bcb8.tar.gz rust-55abf38bf2d7a8c38dd15440cf7bb1a13b04bcb8.zip | |
Add note about upstream commit musl-patch-configure.diff is derived from
Diffstat (limited to 'src/ci/docker')
| -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 |