Repository navigation
ci: make musl.sh look for patches next to the script - #163120
Conversation
Instead of hardcoding the container layout assuming that the local patches are in /build, look for them next to the script. This helps downstream distros to run this script if their container layout is different and they don't put the musl working dir in /build. This might be an unexpected change for some dowstream distros that were using this script from another directory,but arranged for the patches to still be in `/build`
rustbot
added
A-CI
|
rustbot has assigned @Mark-Simulacrum. Use Why was this reviewer chosen?The reviewer was selected based on:
|
|
Hm, can you say a bit more about what your(?) distro is doing here? I would have somewhat expected that most / all distros want to use their own musl rather than whatever Rust happened to package (we're not necessarily amazing at staying up to date...). If I'm reading the code right it seems pretty harmless to land this though. |
Context: we distribute in-house builds of the Rust toolchain for teams inside Microsoft (see blog - although that post is mostly talking about the special things we're doing on Windows, but we do also build Linux host tools and target several platforms using the normal cg_llvm backend) For some targets, we build musl. When we build musl, we're building it in a step in an Azure Pipelines job, not in a Docker container like the ones upstream has defined, so we don't have an analog of these rust/src/ci/docker/host-x86_64/dist-various-1/Dockerfile Lines 67 to 69 in 88638df We don't have a
The paved path for our internal Linux customers steers them to |
|
@bors r+ Okay, that makes sense. I think I'm OK merging this as-is. |
rust-bors
Bot
added
S-waiting-on-bors
…yout, r=Mark-Simulacrum ci: make musl.sh look for patches next to the script Instead of hardcoding the container layout assuming that the local patches are in `/build`, look for them next to the script. This helps downstream distros to run this script if their container layout is different and they don't put the musl working dir in `/build`. This might be an unexpected change for some downstream distros that were using this script from another directory,but arranged for the patches to still be in `/build`
Rollup of 11 pull requests Successful merges: - #163085 (Suggest similarly named modules in import paths) - #163098 ([debugger visualizers] Add workaround to read `Rc` strong/weak counts) - #163120 (ci: make musl.sh look for patches next to the script) - #163301 (Fix unused_must_use for scenario which may need to keep value) - #163307 (Less `SpanData` in diagnostics) - #152972 (implement PartialEq<VecDeque<U>> for Vec<T>, &[T], &mut [T], [T; N], &[T; N] and &mut [T; N]) - #162536 (Implement Default for NumBuffer) - #163141 (Document safety requirements for intrinsic fallbacks) - #163384 (Various clean-ups around `LayoutCalculator`) - #163405 (Remove some #[linkage] options) - #163413 (mailmap: add Matilde Morrone)
Rollup of 11 pull requests Successful merges: - #163085 (Suggest similarly named modules in import paths) - #163098 ([debugger visualizers] Add workaround to read `Rc` strong/weak counts) - #163120 (ci: make musl.sh look for patches next to the script) - #163301 (Fix unused_must_use for scenario which may need to keep value) - #163307 (Less `SpanData` in diagnostics) - #163389 (`rustc_builtin_macros` cleanup, part 7) - #152972 (implement PartialEq<VecDeque<U>> for Vec<T>, &[T], &mut [T], [T; N], &[T; N] and &mut [T; N]) - #162536 (Implement Default for NumBuffer) - #163141 (Document safety requirements for intrinsic fallbacks) - #163384 (Various clean-ups around `LayoutCalculator`) - #163413 (mailmap: add Matilde Morrone)
Rollup merge of #163120 - lambdageek:dont-hardcode-docker-layout, r=Mark-Simulacrum ci: make musl.sh look for patches next to the script Instead of hardcoding the container layout assuming that the local patches are in `/build`, look for them next to the script. This helps downstream distros to run this script if their container layout is different and they don't put the musl working dir in `/build`. This might be an unexpected change for some downstream distros that were using this script from another directory,but arranged for the patches to still be in `/build`
Rollup of 11 pull requests Successful merges: - rust-lang/rust#163085 (Suggest similarly named modules in import paths) - rust-lang/rust#163098 ([debugger visualizers] Add workaround to read `Rc` strong/weak counts) - rust-lang/rust#163120 (ci: make musl.sh look for patches next to the script) - rust-lang/rust#163301 (Fix unused_must_use for scenario which may need to keep value) - rust-lang/rust#163307 (Less `SpanData` in diagnostics) - rust-lang/rust#163389 (`rustc_builtin_macros` cleanup, part 7) - rust-lang/rust#152972 (implement PartialEq<VecDeque<U>> for Vec<T>, &[T], &mut [T], [T; N], &[T; N] and &mut [T; N]) - rust-lang/rust#162536 (Implement Default for NumBuffer) - rust-lang/rust#163141 (Document safety requirements for intrinsic fallbacks) - rust-lang/rust#163384 (Various clean-ups around `LayoutCalculator`) - rust-lang/rust#163413 (mailmap: add Matilde Morrone)
3 participants
Instead of hardcoding the container layout assuming that the local patches are in
/build, look for them next to the script. This helps downstream distros to run this script if their container layout is different and they don't put the musl working dir in/build.This might be an unexpected change for some downstream distros that were using this script from another directory,but arranged for the patches to still be in
/build