language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

try to invoke rustup directly

Browse source
This commit is contained in:
Folkert 2022-11-10 19:21:40 +01:00
parent 4638984513
commit 421413c5cd
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/compiler/build/src/link.rs
View file

@ -3,8 +3,8 @@ use libloading::{Error, Library};
use roc_builtins::bitcode;
use roc_error_macros::internal_error;
use roc_mono::ir::OptLevel;
use roc_utils::get_lib_path;
use roc_utils::{cargo, clang, zig};
use roc_utils::{get_lib_path, rustup};
use std::collections::HashMap;
use std::env;
use std::io;
@ -632,11 +632,11 @@ pub fn rebuild_host(
},
);
let mut cargo_cmd = cargo();
let mut cargo_cmd = if cfg!(windows) { rustup() } else { cargo() };
if cfg!(windows) {
// on windows, we need the `+nightly` toolchain so we can use `-Z export-executable-symbols`
cargo_cmd.arg("+nightly");
cargo_cmd.args(["run", "nightly", "cargo"]);
}
cargo_cmd.arg("build").current_dir(cargo_dir);