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

Bump Rust-BPF to v1.46 (#15273)

Browse Source
This commit is contained in:
Jack May
2021-02-18 11:30:08 -08:00
committed by GitHub
parent e09c8543e4
commit 48785b507b
15 changed files with 32 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/bpf/env.sh
View File

@@ -10,10 +10,10 @@ fi
"$bpf_sdk"/scripts/install.sh
# Use the SDK's version of llvm to build the compiler-builtins for BPF
export CC="$bpf_sdk/dependencies/llvm-native/bin/clang"
export AR="$bpf_sdk/dependencies/llvm-native/bin/llvm-ar"
export OBJDUMP="$bpf_sdk/dependencies/llvm-native/bin/llvm-objdump"
export OBJCOPY="$bpf_sdk/dependencies/llvm-native/bin/llvm-objcopy"
export CC="$bpf_sdk/dependencies/bpf-tools/llvm/bin/clang"
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"
# Use the SDK's version of Rust to build for BPF
export RUSTUP_TOOLCHAIN=bpf
@@ -26,7 +26,7 @@ export RUSTFLAGS="
-C link-arg=-shared \
-C link-arg=--entry=entrypoint \
-C link-arg=-no-threads \
-C linker=$bpf_sdk/dependencies/llvm-native/bin/ld.lld"
-C linker=$bpf_sdk/dependencies/bpf-tools/llvm/bin/ld.lld"
# CARGO may be set if run from within cargo, causing
# incompatibilities between cargo and xargo versions