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

Jump to bottom

🌌 Use build.rustflags (and variants) as a replacement for environment variable to enable spaces in paths #3

Merged
merged 1 commit into from
Sep 26, 2024
Merged

🌌 Use build.rustflags (and variants) as a replacement for environment variable to enable spaces in paths #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions xbuild/src/cargo/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ impl CargoBuild {
}

pub fn set_sysroot(&mut self, path: &Path) {
let arg = format!("--sysroot={}", path.display());
let arg = format!("--sysroot=\"{}\"", path.display());
self.add_cflag(&arg);
self.add_link_arg(&arg);
}
Expand All @@ -480,10 +480,24 @@ impl CargoBuild {
}

pub fn exec(mut self) -> Result<()> {
// TODO: CARGO_ENCODED_RUSTFLAGS doesn't support this?
// self.cargo_target_env("ENCODED_RUSTFLAGS", &self.rust_flags.join(SEP));
self.cmd
.env("CARGO_ENCODED_RUSTFLAGS", &self.rust_flags.join(SEP));
if !self.rust_flags.is_empty() {
let rustflags =
toml::to_string(&self.rust_flags).expect("serializing a string should never fail");

let mut cargo_args: Vec<String> = vec![];

cargo_args.push("--config".into());
if let Some(triple) = self.triple {
cargo_args.push(format!("target.{}.rustflags={}", triple, rustflags));
} else {
cargo_args.push(format!("build.rustflags={}", rustflags));
}

self.cmd.args(cargo_args);
}

self.cmd.env("CC_SHELL_ESCAPED_FLAGS", "1");

self.bindgen_env(&self.c_flags.clone());
self.cc_triple_env("CFLAGS", &self.c_flags.clone());
// These strings already end with a space if they're non-empty:
Expand Down