bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix aarch64 cross compilation

Browse source
This commit is contained in:
Afonso Bordado 2022-07-30 20:24:04 +01:00
parent 8ec3d20882
commit f8747f0a53
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build_system/tests.rs
View file

@ -322,7 +322,7 @@ struct TestRunner {
out_dir: PathBuf, out_dir: PathBuf,
jit_supported: bool, jit_supported: bool,
rust_flags: String, rust_flags: String,
run_wrapper: String, run_wrapper: Vec<String>,
host_triple: String, host_triple: String,
target_triple: String, target_triple: String,
} }
@ -339,18 +339,18 @@ impl TestRunner {
let jit_supported = target_triple.contains("x86_64") && is_native; let jit_supported = target_triple.contains("x86_64") && is_native;
let mut rust_flags = env::var("RUSTFLAGS").ok().unwrap_or("".to_string()); let mut rust_flags = env::var("RUSTFLAGS").ok().unwrap_or("".to_string());
let mut run_wrapper = String::new(); let mut run_wrapper = Vec::new();
if !is_native { if !is_native {
match target_triple.as_str() { match target_triple.as_str() {
"aarch64-unknown-linux-gnu" => { "aarch64-unknown-linux-gnu" => {
// We are cross-compiling for aarch64. Use the correct linker and run tests in qemu. // We are cross-compiling for aarch64. Use the correct linker and run tests in qemu.
rust_flags = format!("-Clinker=aarch64-linux-gnu-gcc {}", rust_flags); rust_flags = format!("-Clinker=aarch64-linux-gnu-gcc{}", rust_flags);
run_wrapper = "qemu-aarch64 -L /usr/aarch64-linux-gnu".to_string(); run_wrapper = vec!["qemu-aarch64", "-L", "/usr/aarch64-linux-gnu"];
}, },
"x86_64-pc-windows-gnu" => { "x86_64-pc-windows-gnu" => {
// We are cross-compiling for Windows. Run tests in wine. // We are cross-compiling for Windows. Run tests in wine.
run_wrapper = "wine".to_string(); run_wrapper = vec!["wine"];
} }
_ => { _ => {
println!("Unknown non-native platform"); println!("Unknown non-native platform");
@ -368,7 +368,7 @@ impl TestRunner {
out_dir, out_dir,
jit_supported, jit_supported,
rust_flags, rust_flags,
run_wrapper, run_wrapper: run_wrapper.iter().map(|s| s.to_string()).collect(),
host_triple, host_triple,
target_triple, target_triple,
} }
@ -446,7 +446,7 @@ impl TestRunner {
// Prepend the RUN_WRAPPER's // Prepend the RUN_WRAPPER's
if !self.run_wrapper.is_empty() { if !self.run_wrapper.is_empty() {
full_cmd.push(self.run_wrapper.clone()); full_cmd.extend(self.run_wrapper.iter().cloned());
} }
full_cmd.push({ full_cmd.push({
@ -459,6 +459,7 @@ impl TestRunner {
full_cmd.push(arg.to_string()); full_cmd.push(arg.to_string());
} }
println!("full_CMD: {:?}", full_cmd);
let mut cmd_iter = full_cmd.into_iter(); let mut cmd_iter = full_cmd.into_iter();
let first = cmd_iter.next().unwrap(); let first = cmd_iter.next().unwrap();