blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cargo incremental builds breaks Rust BPF, locally disable it (#2674)

This commit is contained in:
Jack May 2019-02-06 13:59:10 -08:00 committed by GitHub
parent 7452486c72
commit 5f565c92c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/test-stable-perf.sh
View File

@ -24,9 +24,9 @@ ci/affects-files.sh \
make -C programs/bpf/c tests make -C programs/bpf/c tests
# Must be built out of band # Must be built out of band
#make -C programs/bpf/rust/noop/ all make -C programs/bpf/rust/noop/ all
FEATURES=bpf_c,erasure,chacha FEATURES=bpf_c,bpf_rust,erasure,chacha
if [[ $(uname) = Darwin ]]; then if [[ $(uname) = Darwin ]]; then
./build-perf-libs.sh ./build-perf-libs.sh
else else

2
programs/bpf/rust/noop/makefile
View File

@ -104,7 +104,7 @@ $(OUT_DIR)/%.ll: $(SRC_DIR)/*
@echo "[cargo] $@ ($<)" @echo "[cargo] $@ ($<)"
$(_@)mkdir -p $(OUT_DIR) $(_@)mkdir -p $(OUT_DIR)
$(_@)rm -f $(CARGO_OUT_DIR)/deps/$(TARGET_NAME)-*.ll $(_@)rm -f $(CARGO_OUT_DIR)/deps/$(TARGET_NAME)-*.ll
$(_@)$(CARGO) $(CARGO_FLAGS) $(_@)export CARGO_INCREMENTAL=0; $(CARGO) $(CARGO_FLAGS)
$(_@)cp $(CARGO_OUT_DIR)/deps/$(TARGET_NAME)-*.ll $(OUT_DIR)/$(TARGET_NAME).ll $(_@)cp $(CARGO_OUT_DIR)/deps/$(TARGET_NAME)-*.ll $(OUT_DIR)/$(TARGET_NAME).ll
.PRECIOUS: $(OUT_DIR)/%.o .PRECIOUS: $(OUT_DIR)/%.o