Skip to content

Commit 16e7e05

Browse files
committed
Auto merge of #58575 - mati865:musl_toolchain, r=alexcrichton
Musl host toolchain Based on #55163 and #57359 Depends on #55566 CC #57439 ### How it works Tested compiler made by `dist` on glibc and musl based distributions and verified binaries it produces: * Ubuntu (glibc) - installed it as a target for host toolchain and observed no regressions for static (default) linking, dynamic linking apparently requires musl build libgcc so I didn't test it. * Alpine (musl) - installed as the host toolchain, by default it links statically (executables are portable and work on glibc distributions) but with `-C target-feature=-crt-static` Rust flag it links dynamically (executables require musl built libraries). ### What's debatable It should be decided whether this toolchain should link dynamically or statically when using it on musl distribution. I believe the distributions would prefer dynamic linking but it'd be misleading because `$ARCH-unknown-linux-musl` target links statically on the other hosts. Another problem is using `RUSTFLAGS='-C target-feature=-crt-static'` for dynamic builds which is really uncomfortable. To address both issues I suggest leaving `$ARCH-unknown-linux-musl` static for both host and cross target and introducing "alias triple" `$ARCH-unknown-linux-dynmusl`. It'd be the same as `$ARCH-unknown-linux-musl` (and use the same libraries to avoid duplication) but it'd link dynamically. <del> ### Why it's still WIP (help wanted) I'm having a hard time getting all tests to pass and I'd appreciate help. Non-verbose error: <details> ``` Testing proc_macro stage1 (x86_64-unknown-linux-musl -> x86_64-unknown-linux-musl) Compiling proc_macro v0.0.0 (/checkout/src/libproc_macro) error[E0463]: can't find crate for `std` error[E0463]: can't find crate for `std` error: aborting due to previous error For more information about this error, try `rustc --explain E0463`. error: aborting due to previous error For more information about this error, try `rustc --explain E0463`. [RUSTC-TIMING] proc_macro test:true 0.529 [RUSTC-TIMING] proc_macro test:false 0.530 error: Could not compile `proc_macro`. warning: build failed, waiting for other jobs to finish... error: Could not compile `proc_macro`. To learn more, run the command again with --verbose. command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-musl" "-j" "16" "--release" "--locked" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "-p" "proc_macro" "--" expected success, got: exit code: 101 failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --host x86_64-unknown-linux-musl --target x86_64-unknown-linux-musl ``` </details> Verbose error: <details> ``` Testing proc_macro stage1 (x86_64-unknown-linux-musl -> x86_64-unknown-linux-musl) Compiling proc_macro v0.0.0 (/checkout/src/libproc_macro) Running `/checkout/obj/build/bootstrap/debug/rustc --edition=2018 --crate-name proc_macro src/libproc_macro/lib.rs --color never --crate-type lib --emit=dep-info,link -C opt-level=2 -C metadata=09ddd3ecc930ab63 -C extra-filename=-09ddd3ecc930ab63 --out-dir /checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps --target x86_64-unknown-linux-musl -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/release/deps -C target-feature=-crt-static` Running `/checkout/obj/build/bootstrap/debug/rustc --edition=2018 --crate-name proc_macro src/libproc_macro/lib.rs --color never --emit=dep-info,link -C opt-level=2 --test -C metadata=a564d363930469c8 -C extra-filename=-a564d363930469c8 --out-dir /checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps --target x86_64-unknown-linux-musl -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/release/deps -C target-feature=-crt-static` error[E0463]: can't find crate for `std` error[E0463]: can't find crate for `std` error: aborting due to previous error For more information about this error, try `rustc --explain E0463`. error: aborting due to previous error For more information about this error, try `rustc --explain E0463`. [RUSTC-TIMING] proc_macro test:false 0.248 error: Could not compile `proc_macro`. Caused by: process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --edition=2018 --crate-name proc_macro src/libproc_macro/lib.rs --color never --crate-type lib --emit=dep-info,link -C opt-level=2 -C metadata=09ddd3ecc930ab63 -C extra-filename=-09ddd3ecc930ab63 --out-dir /checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps --target x86_64-unknown-linux-musl -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/release/deps -C target-feature=-crt-static` (exit code: 1) warning: build failed, waiting for other jobs to finish... [RUSTC-TIMING] proc_macro test:true 0.248 error: Could not compile `proc_macro`. Caused by: process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --edition=2018 --crate-name proc_macro src/libproc_macro/lib.rs --color never --emit=dep-info,link -C opt-level=2 --test -C metadata=a564d363930469c8 -C extra-filename=-a564d363930469c8 --out-dir /checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps --target x86_64-unknown-linux-musl -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-musl/stage1-test/release/deps -C target-feature=-crt-static` (exit code: 1) command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-musl" "-j" "16" "--release" "--locked" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "--verbose" "-p" "proc_macro" "--" expected success, got: exit code: 101 failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --host x86_64-unknown-linux-musl --target x86_64-unknown-linux-musl ``` </details> Whole tests non-verbose output: [rust-tests.log](https://github.com/rust-lang/rust/files/2879945/rust-tests.log) I think the error is because build system (correctly?) tries to use `obj/build/x86_64-unknown-linux-musl/stage1-test/x86_64-unknown-linux-musl/release/deps` which is empty but `obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-musl/release/deps` contains required libs. </del>
2 parents 70d1150 + 451343e commit 16e7e05

File tree

3 files changed

+99
-11
lines changed

3 files changed

+99
-11
lines changed

src/ci/docker/dist-x86_64-musl/Dockerfile

+14-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
66
file \
7+
wget \
78
curl \
89
ca-certificates \
910
python2.7 \
@@ -18,19 +19,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1819

1920
WORKDIR /build/
2021

21-
COPY scripts/musl.sh /build/
22+
COPY scripts/musl-toolchain.sh /build/
2223
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
23-
RUN CC=gcc \
24-
CFLAGS="-Wa,-mrelax-relocations=no" \
25-
CXX=g++ \
24+
RUN CFLAGS="-Wa,-mrelax-relocations=no" \
2625
CXXFLAGS="-Wa,-mrelax-relocations=no" \
27-
bash musl.sh x86_64 && rm -rf /build
26+
bash musl-toolchain.sh x86_64 && rm -rf build
2827

2928
COPY scripts/sccache.sh /scripts/
3029
RUN sh /scripts/sccache.sh
3130

3231
ENV RUST_CONFIGURE_ARGS \
33-
--musl-root-x86_64=/musl-x86_64 \
32+
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
3433
--enable-extended \
3534
--disable-docs
3635

@@ -41,6 +40,12 @@ ENV RUST_CONFIGURE_ARGS \
4140
# See: https://github.com/rust-lang/rust/issues/34978
4241
ENV CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
4342

44-
ENV SCRIPT \
45-
python2.7 ../x.py test --target x86_64-unknown-linux-musl && \
46-
python2.7 ../x.py dist --target x86_64-unknown-linux-musl
43+
ENV HOSTS=x86_64-unknown-linux-musl \
44+
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
45+
CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
46+
47+
# Musl defaults to static libs but we need them to be dynamic for host toolchain.
48+
# The toolchain will produce static libs by default.
49+
ENV RUSTFLAGS="-C target-feature=-crt-static"
50+
51+
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# This script runs `musl-cross-make` to prepare C toolchain (Binutils, GCC, musl itself)
2+
# and builds static libunwind that we distribute for static target.
3+
#
4+
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
5+
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
6+
# Right now we have: Binutils 2.27, GCC 6.3.0, musl 1.1.18
7+
set -ex
8+
9+
hide_output() {
10+
set +x
11+
on_err="
12+
echo ERROR: An error was encountered with the build.
13+
cat /tmp/build.log
14+
exit 1
15+
"
16+
trap "$on_err" ERR
17+
bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
18+
PING_LOOP_PID=$!
19+
$@ &> /tmp/build.log
20+
trap - ERR
21+
kill $PING_LOOP_PID
22+
rm /tmp/build.log
23+
set -x
24+
}
25+
26+
ARCH=$1
27+
TARGET=$ARCH-linux-musl
28+
29+
OUTPUT=/usr/local
30+
shift
31+
32+
git clone https://github.com/richfelker/musl-cross-make -b v0.9.7
33+
cd musl-cross-make
34+
35+
hide_output make -j$(nproc) TARGET=$TARGET
36+
hide_output make install TARGET=$TARGET OUTPUT=$OUTPUT
37+
38+
cd -
39+
40+
# Install musl library to make binaries executable
41+
ln -s $OUTPUT/$TARGET/lib/libc.so /lib/ld-musl-$ARCH.so.1
42+
echo $OUTPUT/$TARGET/lib >> /etc/ld-musl-$ARCH.path
43+
44+
45+
export CC=$TARGET-gcc
46+
export CXX=$TARGET-g++
47+
48+
LLVM=70
49+
50+
# may have been downloaded in a previous run
51+
if [ ! -d libunwind-release_$LLVM ]; then
52+
curl -L https://github.com/llvm-mirror/llvm/archive/release_$LLVM.tar.gz | tar xzf -
53+
curl -L https://github.com/llvm-mirror/libunwind/archive/release_$LLVM.tar.gz | tar xzf -
54+
fi
55+
56+
# fixme(mati865): Replace it with https://github.com/rust-lang/rust/pull/59089
57+
mkdir libunwind-build
58+
cd libunwind-build
59+
cmake ../libunwind-release_$LLVM \
60+
-DLLVM_PATH=/build/llvm-release_$LLVM \
61+
-DLIBUNWIND_ENABLE_SHARED=0 \
62+
-DCMAKE_C_COMPILER=$CC \
63+
-DCMAKE_CXX_COMPILER=$CXX \
64+
-DCMAKE_C_FLAGS="$CFLAGS" \
65+
-DCMAKE_CXX_FLAGS="$CXXFLAGS"
66+
67+
hide_output make -j$(nproc)
68+
cp lib/libunwind.a $OUTPUT/$TARGET/lib
69+
cd - && rm -rf libunwind-build
70+

src/ci/docker/test-various/Dockerfile

+15-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
xz-utils
14+
xz-utils \
15+
wget \
16+
patch
1517

1618
# FIXME: build the `ptx-linker` instead.
1719
RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.2/rust-ptx-linker.linux64.tar.gz | \
@@ -20,10 +22,16 @@ RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-a
2022
RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
2123
tar -xJ
2224

25+
WORKDIR /build/
26+
COPY scripts/musl-toolchain.sh /build/
27+
RUN bash musl-toolchain.sh x86_64 && rm -rf build
28+
WORKDIR /
29+
2330
COPY scripts/sccache.sh /scripts/
2431
RUN sh /scripts/sccache.sh
2532

2633
ENV RUST_CONFIGURE_ARGS \
34+
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
2735
--set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
2836
--set rust.lld
2937

@@ -47,4 +55,9 @@ ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
4755
ENV NVPTX_SCRIPT python2.7 /checkout/x.py test --target $NVPTX_TARGETS \
4856
src/test/run-make
4957

50-
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT
58+
ENV MUSL_TARGETS=x86_64-unknown-linux-musl \
59+
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
60+
CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
61+
ENV MUSL_SCRIPT python2.7 /checkout/x.py test --target $MUSL_TARGETS
62+
63+
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT

0 commit comments

Comments
 (0)