From 28c1cf440540c50beaf8b011e1bc962af0630e54 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Fri, 7 Jan 2022 19:58:26 +1100 Subject: [PATCH] Revert "cargo-build-bpf: don't set -C linker on windows (#22314)" This reverts commit 0459f0a4c09f7a9f42d252f7fa2046f30295d8b8. --- sdk/cargo-build-bpf/src/main.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs index d2559777d9..99163a823e 100644 --- a/sdk/cargo-build-bpf/src/main.rs +++ b/sdk/cargo-build-bpf/src/main.rs @@ -516,11 +516,17 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m env::set_var("OBJDUMP", llvm_bin.join("llvm-objdump")); env::set_var("OBJCOPY", llvm_bin.join("llvm-objcopy")); - if config.verbose { - println!( - "RUSTFLAGS={}", - env::var("RUSTFLAGS").ok().as_deref().unwrap_or("") - ); + if let Ok(mut rustflags) = env::var("RUSTFLAGS") { + if cfg!(windows) && !rustflags.contains("-C linker=") { + let ld_path = llvm_bin.join("ld.lld"); + rustflags = format!("{} -C linker={}", rustflags, ld_path.display()); + } + + if config.verbose { + println!("RUSTFLAGS={}", rustflags); + } + + env::set_var("RUSTFLAGS", rustflags); }; let cargo_build = PathBuf::from("cargo");