gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unix path separators

Browse Source
This commit is contained in:
Michael Vines
2021-02-18 23:23:04 -08:00
parent 8e6441c1f6
commit 6a8dd86722
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/cargo-build-bpf/src/main.rs
View File

@ -118,7 +118,9 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
.cloned() .cloned()
.unwrap_or_else(|| target_directory.join("deploy")); .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| { env::set_current_dir(&root_package_dir).unwrap_or_else(|err| {
eprintln!( eprintln!(
@ -140,7 +142,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
println!("Legacy program feature detected"); 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![]; let mut xargo_build_args = vec![];
if config.no_default_features { 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) { if file_older_or_missing(&program_unstripped_so, &program_so) {
spawn( spawn(
&config.bpf_sdk.join("scripts/strip.sh"), &config.bpf_sdk.join("scripts").join("strip.sh"),
&[&program_unstripped_so, &program_so], &[&program_unstripped_so, &program_so],
); );
} }
if config.dump && file_older_or_missing(&program_unstripped_so, &program_dump) { if config.dump && file_older_or_missing(&program_unstripped_so, &program_dump) {
spawn( spawn(
&config.bpf_sdk.join("scripts/dump.sh"), &config.bpf_sdk.join("scripts").join("dump.sh"),
&[&program_unstripped_so, &program_dump], &[&program_unstripped_so, &program_dump],
); );
} }