Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore host C++ runtime in a cross build scenario #114078

Closed
wants to merge 3 commits into from
Closed

Ignore host C++ runtime in a cross build scenario #114078

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a0af6
rustc_llvm: DragonFlyBSD uses a GNU toolchain
Jul 22, 2023
bfa4c4a
rustc_llvm: ignore host flags for cross builds
Jul 23, 2023
274a58d
rustc_llvm: Ignore C++ runtime libs for xcompile
Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion compiler/rustc_llvm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,18 @@ fn main() {
continue;
}

// In the cross compiling case we pick up the C++ runtime flags from the host compiler
// and not the target. This breaks the build in the case of the host and target using
// different runtimes.
if is_crossed && flag.starts_with("-stdlib") {
println!("cargo:warning=Skipping attempt to set C++ library to {flag:?} on target {target:?}");

// Most targets these days seem to use libc+, but DragonFly uses GNU libstdc++ for sure
if target.contains("dragonfly") {
continue;
}
}

// -Wdate-time is not supported by the netbsd cross compiler
if is_crossed && target.contains("netbsd") && flag.contains("date-time") {
continue;
Expand Down Expand Up @@ -343,6 +355,8 @@ fn main() {
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
"stdc++_p"
} else if target.contains("dragonfly") {
"stdc++"
} else if llvm_use_libcxx.is_some() {
"c++"
} else {
Expand All @@ -368,7 +382,11 @@ fn main() {
} else {
println!("cargo:rustc-link-lib=static={stdcppname}");
}
} else if cxxflags.contains("stdlib=libc++") {
} else if !is_crossed && cxxflags.contains("stdlib=libc++") {
// If we're in a cross build these flags come from the host
// compiler and not the target compiler. In the case of an
// Apple to non-Apple cross build, there's a good chance we
// don't want libc++.
println!("cargo:rustc-link-lib=c++");
} else {
println!("cargo:rustc-link-lib={stdcppname}");
Expand Down