Cleanup Rust BPF program building (#4318)

This commit is contained in:
Jack May
2019-05-16 17:35:42 -07:00
committed by GitHub
parent b3e45fd6b7
commit 9271ba0039
4 changed files with 61 additions and 62 deletions

View File

@ -6,10 +6,12 @@ cargo install xargo
set -e
# Ensure the sdk is installed
../../../../sdk/bpf/scripts/install.sh
rustup override set bpf
bpf_sdk=../../../../sdk/bpf
# Ensure the sdk is installed
"$bpf_sdk"/scripts/install.sh
export RUSTUP_TOOLCHAIN=bpf
export RUSTFLAGS="$RUSTFLAGS \
-C lto=no \
-C opt-level=2 \
@ -18,10 +20,9 @@ export RUSTFLAGS="$RUSTFLAGS \
-C link-arg=--Bdynamic \
-C link-arg=-shared \
-C link-arg=--entry=entrypoint \
-C linker=../../../../sdk/bpf/llvm-native/bin/ld.lld"
-C linker=$bpf_sdk/llvm-native/bin/ld.lld"
export XARGO_HOME="$PWD/target/xargo"
export XARGO_RUST_SRC="../../../../sdk/bpf/rust-bpf-sysroot/src"
# export XARGO_RUST_SRC="../../../../../rust-bpf-sysroot/src"
export XARGO_RUST_SRC="$bpf_sdk/rust-bpf-sysroot/src"
xargo build --target bpfel-unknown-unknown --release -v
{ { set +x; } 2>/dev/null; echo Success; }

View File

@ -7,6 +7,6 @@ set -e
./clean.sh
./build.sh
ls -la ./target/bpfel_unknown_unknown/release/solana_bpf_rust_noop.so > dump.txt
greadelf -aW ./target/bpfel_unknown_unknown/release/solana_bpf_rust_noop.so | rustfilt >> dump.txt
llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel_unknown_unknown/release/solana_bpf_rust_noop.so >> dump.txt
ls -la ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so > dump.txt
greadelf -aW ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so | rustfilt >> dump.txt
llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so >> dump.txt