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

Cargo build bug fix. #143

Closed
wants to merge 3 commits into from
Closed

Cargo build bug fix. #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc40db5
rust-toolchain: update the newer toolchain version for <cargo build> …
Jerryy959 Feb 18, 2025
426a1d3
Merge branch 'main' into dev/fix-build-bug
LegNeato Mar 7, 2025
4d4b480
Update crates/rustc_codegen_nvvm/build.rs
LegNeato Mar 7, 2025
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
5 changes: 3 additions & 2 deletions crates/rustc_codegen_nvvm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ pub fn output(cmd: &mut Command) -> String {
fn target_to_llvm_prebuilt(target: &str) -> String {
let base = match target {
"x86_64-pc-windows-msvc" => "windows-x86_64",
// NOTE(RDambrosio016): currently disabled because of weird issues with segfaults and building the C++ shim
// "x86_64-unknown-linux-gnu" => "linux-x86_64",
// NOTE(LegNeato): was disabled in the past because of weird issues with segfaults and building the C++ shim. Need to investigate if they are still around.
"x86_64-unknown-linux-gnu" => "linux-x86_64",
_ => panic!("Unsupported target with no matching prebuilt LLVM: `{}`, install LLVM and set LLVM_CONFIG", target)
};
format!("{}.tar.xz", base)
Expand Down Expand Up @@ -90,6 +90,7 @@ fn find_llvm_config(target: &str) -> PathBuf {
.map(|x| x.to_string_lossy().to_string())
.unwrap_or_else(|| PREBUILT_LLVM_URL.to_string());

println!("cargo:warning=Using prebuilt LLVM from {}", url);
let prebuilt_name = target_to_llvm_prebuilt(target);
url = format!("{}{}", url, prebuilt_name);

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

[toolchain]
channel = "nightly-2025-01-23"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
Loading