Skip to content

Commit 06194ca

Browse files
committedJun 10, 2024
Auto merge of rust-lang#126206 - Kobzol:disable-libstdc++-version-check, r=Mark-Simulacrum
Remove libstdc++ version check error This keeps the error message from rust-lang#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`
2 parents d2fb97f + 5349476 commit 06194ca

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed
 

‎src/bootstrap/src/core/sanity.rs

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ pub fn check(build: &mut Build) {
128128
eprintln!(
129129
"Consider upgrading libstdc++ or disabling the `llvm.download-ci-llvm` option."
130130
);
131-
crate::exit!(1);
132131
}
133132
}
134133
tool::LibcxxVersion::Llvm(_) => {

0 commit comments

Comments
 (0)