blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update RUSTFLAGS if it is set, instead of overriding in build-bpf

This commit is contained in:
Dmitri Makarov 2021-06-11 10:23:15 -07:00 committed by Dmitri Makarov
parent 22c356d24c
commit 3026954d71
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/bpf/env.sh
View File

@ -15,4 +15,4 @@ export AR="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-ar"
export OBJDUMP="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objdump"
export OBJCOPY="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objcopy"
export RUSTFLAGS="-C lto=no"
export RUSTFLAGS="${RUSTFLAGS} -C lto=no"

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

@ -448,7 +448,14 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
env::set_var("AR", llvm_bin.join("llvm-ar"));
env::set_var("OBJDUMP", llvm_bin.join("llvm-objdump"));
env::set_var("OBJCOPY", llvm_bin.join("llvm-objcopy"));
env::set_var("RUSTFLAGS", "-C lto=no");
let rustflags = match env::var("RUSTFLAGS") {
Ok(rf) => rf + &" -C lto=no".to_string(),
_ => "-C lto=no".to_string(),
};
if config.verbose {
println!("RUSTFLAGS={}", rustflags);
}
env::set_var("RUSTFLAGS", rustflags);
let cargo_build = PathBuf::from("cargo");
let mut cargo_build_args = vec![
"+bpf",