Merge branch 'main' of github.com:roc-lang/roc into rust_version_upgrade

This commit is contained in:
Anton-4 2023-04-22 17:14:01 +02:00
commit 937722c462
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
36 changed files with 217 additions and 198 deletions

View file

@ -719,7 +719,7 @@ pub fn rebuild_host(
if matches!(opt_level, OptLevel::Optimize) {
rustc_cmd.arg("-O");
} else if matches!(opt_level, OptLevel::Size) {
rustc_cmd.arg("-C opt-level=s");
rustc_cmd.args(["-C", "opt-level=s"]);
}
run_build_command(rustc_cmd, "host.rs", 0);
@ -1100,7 +1100,7 @@ fn link_linux(
// Keep NIX_ env vars
.envs(
env::vars()
.filter(|&(ref k, _)| k.starts_with("NIX_"))
.filter(|(k, _)| k.starts_with("NIX_"))
.collect::<HashMap<String, String>>(),
)
.args([