about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-06-10 06:20:06 +0000
committerbors <bors@rust-lang.org>2024-06-10 06:20:06 +0000
commit06194cadcd0948a7100b46737f61e82b8c00d632 (patch)
treed33b094f60302e8ce638de6cfe6050229735b0ac /src
parentd2fb97fceccb7b7d71c40cc2d3c9b376fd2883aa (diff)
parent5349476a0351f6d97076bc5ac9857994ee0e839b (diff)
Auto merge of #126206 - Kobzol:disable-libstdc++-version-check, r=Mark-Simulacrum
Remove libstdc++ version check error

This keeps the error message from https://github.com/rust-lang/rust/pull/125411, but removes the `exit(1)` call.

This PR is mostly a hotfix to unblock bootstrap benchmarks in rustc-perf.

However, I think that it might be better to just print a warning, in general. If the ABI version does not match, the build might or might not work locally (as we can see on rustc-perf, where it works even if the reported ABI is 7).

If it does not work (and **if** we can always recognize this during the LLVM wrapper build, instead of having some silent miscompilations), then the user will have to update their libstdc++ anyway, the error does not help them out on its own. So it should be enough to just provide a better error message, without blocking the build.

But I'm not adamant on that, I just want to unblock bootstrap benchmarks until we can find a way to update libstdc++ on the collector machine.

CC `@onur-ozkan`

r? `@Mark-Simulacrum`
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/src/core/sanity.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
index e3556cb16b0..b5f17b9f54e 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
@@ -128,7 +128,6 @@ pub fn check(build: &mut Build) {
                     eprintln!(
                         "Consider upgrading libstdc++ or disabling the `llvm.download-ci-llvm` option."
                     );
-                    crate::exit!(1);
                 }
             }
             tool::LibcxxVersion::Llvm(_) => {