From 3026954d7169ec25536b68b48ad86d23260696b5 Mon Sep 17 00:00:00 2001 From: Dmitri Makarov Date: Fri, 11 Jun 2021 10:23:15 -0700 Subject: [PATCH] Update RUSTFLAGS if it is set, instead of overriding in build-bpf --- sdk/bpf/env.sh | 2 +- sdk/cargo-build-bpf/src/main.rs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sdk/bpf/env.sh b/sdk/bpf/env.sh index 8dfb02464..55a49f9ea 100644 --- a/sdk/bpf/env.sh +++ b/sdk/bpf/env.sh @@ -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" diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs index e8039b649..9d8918562 100644 --- a/sdk/cargo-build-bpf/src/main.rs +++ b/sdk/cargo-build-bpf/src/main.rs @@ -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",