Disable combining LLD with external llvm-config #139853

Kobzol · 2025-04-15T08:44:42Z

When an external llvm-config is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using rust-lld nor copy it to the target sysroot.

Fixes: #139477

CC @cuviper

r? @onur-ozkan

try-job: dist-x86_64-linux
try-job: dist-aarch64-linux

rustbot · 2025-04-15T08:44:48Z

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

r=me with/without the nit once CI is green

onur-ozkan · 2025-04-15T09:00:50Z

src/bootstrap/src/core/config/config.rs

            );
        }

+        let has_external_llvm_config = !config.llvm_from_ci


Nit: We could move Builder::is_system_llvm to Config since it doesn't rely on any Builder specific data (other than is_builder_target function which can also be moved).

I don't feel very comfortable calling Config functions in Config::parse, because it's essentially its constructor, and some of the attributes used in the functions might not be initialized properly yet when the function is called. That being said, we access specific properties on the config variable anyway, so that's probably not so different. Moved the functions.

rustbot · 2025-04-15T10:16:36Z

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

Kobzol · 2025-04-15T10:16:39Z

@rustbot ready

…uilder` to `Config`

onur-ozkan · 2025-04-15T15:56:10Z

@bors r+

bors · 2025-04-15T15:56:13Z

📌 Commit 689b4c9 has been approved by onur-ozkan

It is now in the queue for this repository.

Disable combining LLD with external llvm-config When an external `llvm-config` is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using `rust-lld` nor copy it to the target sysroot. Fixes: rust-lang#139477 CC `@cuviper` r? `@onur-ozkan`

Rollup of 8 pull requests Successful merges: - rust-lang#136926 (Stabilize `-Zdwarf-version` as `-Cdwarf-version`) - rust-lang#139647 (Add unstable parsing of `--extern foo::bar=libbar.rlib` command line options) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139867 (Fix some tidy paper cuts) - rust-lang#139871 (Fix wrong "move keyword" suggestion for async gen block) - rust-lang#139880 (Don't compute name of associated item if it's an RPITIT) - rust-lang#139884 (Update books) - rust-lang#139886 (`borrowck_graphviz_*` attribute tweaks) r? `@ghost` `@rustbot` modify labels: rollup

Disable combining LLD with external llvm-config When an external `llvm-config` is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using `rust-lld` nor copy it to the target sysroot. Fixes: rust-lang#139477 CC ``@cuviper`` r? ``@onur-ozkan``

Rollup of 10 pull requests Successful merges: - rust-lang#139647 (Add unstable parsing of `--extern foo::bar=libbar.rlib` command line options) - rust-lang#139823 (Fix some bootstrap papercuts) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139867 (Fix some tidy paper cuts) - rust-lang#139871 (Fix wrong "move keyword" suggestion for async gen block) - rust-lang#139876 (Make CodeStats' type_sizes public) - rust-lang#139880 (Don't compute name of associated item if it's an RPITIT) - rust-lang#139884 (Update books) - rust-lang#139886 (`borrowck_graphviz_*` attribute tweaks) - rust-lang#139893 (Add test for issue 125668) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar · 2025-04-16T12:11:15Z

I think this failed in rollup: #139895 (comment)

Zalathar · 2025-04-16T12:11:22Z

@bors r-

Disable combining LLD with external llvm-config When an external `llvm-config` is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using `rust-lld` nor copy it to the target sysroot. Fixes: rust-lang#139477 CC `@cuviper` r? `@onur-ozkan` try-job: dist-x86_64-linux try-job: dist-aarch64-linux

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#138528 (deref patterns: implement implicit deref patterns) - rust-lang#138934 (support config extensions) - rust-lang#139114 (Implement `pin!()` using `super let`) - rust-lang#139393 (rustdoc-json: Output target feature information) - rust-lang#139553 (sync::mpsc: prevent double free on `Drop`) - rust-lang#139615 (Remove `name_or_empty`) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - rust-lang#139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup

Disable combining LLD with external llvm-config When an external `llvm-config` is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using `rust-lld` nor copy it to the target sysroot. Fixes: rust-lang#139477 CC `@cuviper` r? `@onur-ozkan` try-job: dist-x86_64-linux try-job: dist-aarch64-linux

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#138528 (deref patterns: implement implicit deref patterns) - rust-lang#138934 (support config extensions) - rust-lang#139393 (rustdoc-json: Output target feature information) - rust-lang#139553 (sync::mpsc: prevent double free on `Drop`) - rust-lang#139615 (Remove `name_or_empty`) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - rust-lang#139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#138528 (deref patterns: implement implicit deref patterns) - rust-lang#139393 (rustdoc-json: Output target feature information) - rust-lang#139553 (sync::mpsc: prevent double free on `Drop`) - rust-lang#139615 (Remove `name_or_empty`) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - rust-lang#139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139853 - Kobzol:lld-llvm-config, r=onur-ozkan Disable combining LLD with external llvm-config When an external `llvm-config` is used, we don't really know anything about the external LLD, as we don't build it ourselves. Therefore, we probably shouldn't allow using `rust-lld` nor copy it to the target sysroot. Fixes: rust-lang#139477 CC ``@cuviper`` r? ``@onur-ozkan`` try-job: dist-x86_64-linux try-job: dist-aarch64-linux

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#138528 (deref patterns: implement implicit deref patterns) - rust-lang#139393 (rustdoc-json: Output target feature information) - rust-lang#139553 (sync::mpsc: prevent double free on `Drop`) - rust-lang#139615 (Remove `name_or_empty`) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - rust-lang#139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup

See rust-lang/rust#139853. Chromium uses `llvm-config` in `config.toml.template` (https://source.chromium.org/chromium/chromium/src/+/3802adbb9d98955a972476a190b4bd015f45328e:tools/rust/config.toml.template;l=55,64,73,82), but the PR prevents building and copying `rust-lld` when `llvm-config` is being used.

…<try> Make combining LLD with external LLVM config a hard error Younger me made this only a warning in #139853, because our post-dist tests were relying on this. But that was not a good idea, because there are a bunch of places in bootstrap that outright try to build LLD/copy LLD to sysroot when `lld_enabled` is true (rightfully so), which is causing issues (#143076). Instead of piling more hacks, I'd like to just disallow this, and use hack to make our CI work instead. If this breaks the CI post-dist tests, I'll either add some special environment variable for it, or, as an alternative, make the error back into a warning, but also disable `lld_enabled` when this situation happens. try-job: dist-x86_64-linux

…-config, r=Jieyouxu Make combining LLD with external LLVM config a hard error Younger me made this only a warning in rust-lang#139853, because our post-dist tests were relying on this. But that was not a good idea, because there are a bunch of places in bootstrap that outright try to build LLD/copy LLD to sysroot when `lld_enabled` is true (rightfully so), which is causing issues (rust-lang#143076). Instead of piling more hacks, I'd like to just disallow this, and if we need to use a hack, do it only for our CI. If this breaks the CI post-dist tests, I'll either add some special environment variable for it, or, as an alternative, make the error back into a warning, but also disable `lld_enabled` when this situation happens. try-job: dist-x86_64-linux Fixes: rust-lang#143175

Rollup merge of #143175 - Kobzol:bootstrap-lld-external-llvm-config, r=Jieyouxu Make combining LLD with external LLVM config a hard error Younger me made this only a warning in #139853, because our post-dist tests were relying on this. But that was not a good idea, because there are a bunch of places in bootstrap that outright try to build LLD/copy LLD to sysroot when `lld_enabled` is true (rightfully so), which is causing issues (#143076). Instead of piling more hacks, I'd like to just disallow this, and if we need to use a hack, do it only for our CI. If this breaks the CI post-dist tests, I'll either add some special environment variable for it, or, as an alternative, make the error back into a warning, but also disable `lld_enabled` when this situation happens. try-job: dist-x86_64-linux Fixes: #143175

…r=Jieyouxu Make combining LLD with external LLVM config a hard error Younger me made this only a warning in rust-lang/rust#139853, because our post-dist tests were relying on this. But that was not a good idea, because there are a bunch of places in bootstrap that outright try to build LLD/copy LLD to sysroot when `lld_enabled` is true (rightfully so), which is causing issues (rust-lang/rust#143076). Instead of piling more hacks, I'd like to just disallow this, and if we need to use a hack, do it only for our CI. If this breaks the CI post-dist tests, I'll either add some special environment variable for it, or, as an alternative, make the error back into a warning, but also disable `lld_enabled` when this situation happens. try-job: dist-x86_64-linux Fixes: rust-lang/rust#143175

rustbot assigned onur-ozkan Apr 15, 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 Apr 15, 2025

Kobzol mentioned this pull request Apr 15, 2025

FTBFS tarball rust 1.86.0: generated a symlink in a tarball: rust-lld #139477

Closed

This comment has been minimized.

Sign in to view

Kobzol force-pushed the lld-llvm-config branch from 333ee68 to baab050 Compare April 15, 2025 08:55

onur-ozkan approved these changes Apr 15, 2025

View reviewed changes

Kobzol force-pushed the lld-llvm-config branch from baab050 to d224443 Compare April 15, 2025 10:16

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Apr 15, 2025

This comment has been minimized.

Sign in to view

Kobzol added 2 commits April 15, 2025 14:12

Move is_builder_target, is_system_llvm and is_rust_llvm from `B…

2907ab5

…uilder` to `Config`

Rename is_builder_target to is_host_target

3c01dfe

Kobzol force-pushed the lld-llvm-config branch from d224443 to 689b4c9 Compare April 15, 2025 12:14

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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 15, 2025

Zalathar mentioned this pull request Apr 16, 2025

Rollup of 8 pull requests #139888

Closed

Zalathar mentioned this pull request Apr 16, 2025

Rollup of 10 pull requests #139895

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 16, 2025

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 16, 2025

matthiaskrgr mentioned this pull request Apr 17, 2025

Rollup of 9 pull requests #139957

Closed

matthiaskrgr mentioned this pull request Apr 17, 2025

Rollup of 8 pull requests #139980

Closed

matthiaskrgr mentioned this pull request Apr 18, 2025

Rollup of 7 pull requests #139996

Merged

bors merged commit ac00a37 into rust-lang:master Apr 18, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 18, 2025

Kobzol deleted the lld-llvm-config branch April 18, 2025 17:25

This was referenced Apr 29, 2025

Adding wasm32-unknown-unknown to a Rust toolchain compiled against a specific LLVM revision #140473

Open

rust-lld is no longer distributed if you link against a custom LLVM brave/brave-browser#45769

Closed

onur-ozkan mentioned this pull request May 23, 2025

1.87 build fails with LLVM 19 #141353

Closed

jpalus mentioned this pull request Jun 28, 2025

rustc-1.88.0 does not build using external LLVM due to missing rust-lld #143076

Open

Kobzol mentioned this pull request Jun 29, 2025

Make combining LLD with external LLVM config a hard error #143175

Merged

Uh oh!

Disable combining LLD with external llvm-config #139853

Disable combining LLD with external llvm-config #139853

Uh oh!

Conversation

Kobzol commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 15, 2025

Uh oh!

This comment has been minimized.

onur-ozkan left a comment

Choose a reason for hiding this comment

Uh oh!

onur-ozkan Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

rustbot commented Apr 15, 2025

Uh oh!

Kobzol commented Apr 15, 2025

Uh oh!

This comment has been minimized.

onur-ozkan commented Apr 15, 2025

Uh oh!

bors commented Apr 15, 2025

Uh oh!

Zalathar commented Apr 16, 2025

Uh oh!

Zalathar commented Apr 16, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Kobzol commented Apr 15, 2025 •

edited

Loading