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

Revert "cargo-build-bpf: don't set -C linker on windows (#22314)"

Browse Source 
This reverts commit 0459f0a4c0.
This commit is contained in:
Alessandro Decina
2022-01-07 19:58:26 +11:00
committed by GitHub
parent e2aa932e97
commit 28c1cf4405
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");