Update RUSTFLAGS if it is set, instead of overriding in build-bpf
This commit is contained in:
parent
22c356d24c
commit
3026954d71
|
@ -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"
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue