bootstrap: only build `crt{begin,end}.o` when compiling to MUSL #135836

japaric · 2025-01-21T17:05:29Z

only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors

check the target before shelling out to the C compiler and tweak make_run to skip the actual C compilation when the target is not MUSL

fixes #135782

see the linked issue for additional context

rustbot · 2025-01-21T17:05:37Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-01-21T17:05:39Z

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

onur-ozkan · 2025-01-21T20:05:15Z

src/bootstrap/src/core/build_steps/llvm.rs

+        assert!(
+            self.target.needs_crt_begin_end(),
+            "tried to build crtbegin.o and crtend.o for the wrong target ({})",
+            self.target
+        );


I think we should still be able to build this when invoked manually.

src/bootstrap/src/core/build_steps/llvm.rs

onur-ozkan · 2025-01-21T20:10:25Z

r? onur-ozkan

jieyouxu · 2025-01-22T04:01:20Z

@rustbot author

onur-ozkan · 2025-01-29T11:57:26Z

LGTM other than #135836 (comment) note, will queue this once it's resolved.

only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782

japaric · 2025-01-31T13:35:17Z

@onur-ozkan removed the assertion

onur-ozkan · 2025-01-31T16:07:02Z

@bors r+

bors · 2025-01-31T16:07:06Z

📌 Commit 88260f4 has been approved by onur-ozkan

It is now in the queue for this repository.

…ly-for-musl, r=onur-ozkan bootstrap: only build `crt{begin,end}.o` when compiling to MUSL only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782 see the linked issue for additional context

…kingjubilee Rollup of 16 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#135768 (tests: Port `symbol-mangling-hashed` to rmake.rs) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#135840 (omit unused args warnings for intrinsics without body) - rust-lang#135900 (Manually walk into WF obligations in `BestObligation` proof tree visitor) - rust-lang#136146 (Explicitly choose x86 softfloat/hardfloat ABI) - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe}) - rust-lang#136163 (Fix off-by-one error causing slice::sort to abort the program) - rust-lang#136266 (fix broken release notes id) - rust-lang#136283 (Update encode_utf16 to mention it is native endian) - rust-lang#136309 (set rustc dylib on manually constructed rustc command) - rust-lang#136314 (Use proper type when applying deref adjustment in const) - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets) - rust-lang#136348 (miri: make float min/max non-deterministic) - rust-lang#136351 (Add documentation for derive(CoercePointee)) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) Failed merges: - rust-lang#135994 (Rename rustc_middle::Ty::is_unsafe_ptr to is_raw_ptr) r? `@ghost` `@rustbot` modify labels: rollup

…ly-for-musl, r=onur-ozkan bootstrap: only build `crt{begin,end}.o` when compiling to MUSL only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782 see the linked issue for additional context

Rollup of 11 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#134740 (Add amdgpu target) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe}) - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs) - rust-lang#136283 (Update encode_utf16 to mention it is native endian) - rust-lang#136309 (set rustc dylib on manually constructed rustc command) - rust-lang#136328 (Rework "long type names" printing logic) - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) - rust-lang#136368 (Make comma separated lists of anything easier to make for errors) r? `@ghost` `@rustbot` modify labels: rollup

…ly-for-musl, r=onur-ozkan bootstrap: only build `crt{begin,end}.o` when compiling to MUSL only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782 see the linked issue for additional context

Rollup of 10 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#134740 (Add amdgpu target) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs) - rust-lang#136283 (Update encode_utf16 to mention it is native endian) - rust-lang#136309 (set rustc dylib on manually constructed rustc command) - rust-lang#136328 (Rework "long type names" printing logic) - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) - rust-lang#136368 (Make comma separated lists of anything easier to make for errors) r? `@ghost` `@rustbot` modify labels: rollup try-job: dist-powerpc64-linux

…ly-for-musl, r=onur-ozkan bootstrap: only build `crt{begin,end}.o` when compiling to MUSL only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782 see the linked issue for additional context

Rollup of 5 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs) - rust-lang#136328 (Rework "long type names" printing logic) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) r? `@ghost` `@rustbot` modify labels: rollup try-job: dist-powerpc64-linux

Rollup of 11 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#134740 (Add amdgpu target) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe}) - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs) - rust-lang#136283 (Update encode_utf16 to mention it is native endian) - rust-lang#136309 (set rustc dylib on manually constructed rustc command) - rust-lang#136328 (Rework "long type names" printing logic) - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) - rust-lang#136368 (Make comma separated lists of anything easier to make for errors) r? `@ghost` `@rustbot` modify labels: rollup try-job: dist-powerpc64-linux

rustbot assigned jieyouxu Jan 21, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 21, 2025

onur-ozkan reviewed Jan 21, 2025

View reviewed changes

src/bootstrap/src/core/build_steps/llvm.rs Show resolved Hide resolved

rustbot assigned onur-ozkan and unassigned jieyouxu Jan 21, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 22, 2025

japaric force-pushed the ja-gh135782-build-crt-only-for-musl branch from 0b27658 to 88260f4 Compare January 31, 2025 13:34

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2025

workingjubilee mentioned this pull request Jan 31, 2025

Rollup of 16 pull requests #136367

Closed

jhpratt mentioned this pull request Feb 1, 2025

Rollup of 11 pull requests #136378

Closed

matthiaskrgr mentioned this pull request Feb 1, 2025

Rollup of 10 pull requests #136380

Closed

matthiaskrgr mentioned this pull request Feb 1, 2025

Rollup of 5 pull requests #136386

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bootstrap: only build `crt{begin,end}.o` when compiling to MUSL #135836

bootstrap: only build `crt{begin,end}.o` when compiling to MUSL #135836

japaric commented Jan 21, 2025

rustbot commented Jan 21, 2025

rustbot commented Jan 21, 2025

onur-ozkan Jan 21, 2025

onur-ozkan commented Jan 21, 2025

jieyouxu commented Jan 22, 2025

onur-ozkan commented Jan 29, 2025

japaric commented Jan 31, 2025

onur-ozkan commented Jan 31, 2025

bors commented Jan 31, 2025

bootstrap: only build crt{begin,end}.o when compiling to MUSL #135836

Are you sure you want to change the base?

bootstrap: only build crt{begin,end}.o when compiling to MUSL #135836

Conversation

japaric commented Jan 21, 2025

rustbot commented Jan 21, 2025

rustbot commented Jan 21, 2025

onur-ozkan Jan 21, 2025

Choose a reason for hiding this comment

onur-ozkan commented Jan 21, 2025

jieyouxu commented Jan 22, 2025

onur-ozkan commented Jan 29, 2025

japaric commented Jan 31, 2025

onur-ozkan commented Jan 31, 2025

bors commented Jan 31, 2025

bootstrap: only build `crt{begin,end}.o` when compiling to MUSL #135836

bootstrap: only build `crt{begin,end}.o` when compiling to MUSL #135836