From 2bfe545438d0e54c4882fe2e2264b7ac0b1a9e90 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 18 Feb 2021 23:23:04 -0800 Subject: [PATCH] Remove unix path separators (cherry picked from commit 6a8dd86722035321c6fd02d3805330aab48690c6) --- sdk/cargo-build-bpf/src/main.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs index abee74e221..181b42d78d 100644 --- a/sdk/cargo-build-bpf/src/main.rs +++ b/sdk/cargo-build-bpf/src/main.rs @@ -118,7 +118,9 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m .cloned() .unwrap_or_else(|| target_directory.join("deploy")); - let target_build_directory = target_directory.join("bpfel-unknown-unknown/release"); + let target_build_directory = target_directory + .join("bpfel-unknown-unknown") + .join("release"); env::set_current_dir(&root_package_dir).unwrap_or_else(|err| { eprintln!( @@ -140,7 +142,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m println!("Legacy program feature detected"); } - let xargo_build = config.bpf_sdk.join("rust/xargo-build.sh"); + let xargo_build = config.bpf_sdk.join("rust").join("xargo-build.sh"); let mut xargo_build_args = vec![]; if config.no_default_features { @@ -199,14 +201,14 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m if file_older_or_missing(&program_unstripped_so, &program_so) { spawn( - &config.bpf_sdk.join("scripts/strip.sh"), + &config.bpf_sdk.join("scripts").join("strip.sh"), &[&program_unstripped_so, &program_so], ); } if config.dump && file_older_or_missing(&program_unstripped_so, &program_dump) { spawn( - &config.bpf_sdk.join("scripts/dump.sh"), + &config.bpf_sdk.join("scripts").join("dump.sh"), &[&program_unstripped_so, &program_dump], ); }