From 5f565c92c9ff66d5540cf18fb0fa66ba7877a8a4 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Wed, 6 Feb 2019 13:59:10 -0800
Subject: [PATCH] cargo incremental builds breaks Rust BPF, locally disable it
 (#2674)

---
 ci/test-stable-perf.sh          | 4 ++--
 programs/bpf/rust/noop/makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/test-stable-perf.sh b/ci/test-stable-perf.sh
index c4b06acf46..ed4dfc79b0 100755
--- a/ci/test-stable-perf.sh
+++ b/ci/test-stable-perf.sh
@@ -24,9 +24,9 @@ ci/affects-files.sh \
 make -C programs/bpf/c tests
 
 # 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
   ./build-perf-libs.sh
 else
diff --git a/programs/bpf/rust/noop/makefile b/programs/bpf/rust/noop/makefile
index 1e2b849f2f..73522977be 100755
--- a/programs/bpf/rust/noop/makefile
+++ b/programs/bpf/rust/noop/makefile
@@ -104,7 +104,7 @@ $(OUT_DIR)/%.ll: $(SRC_DIR)/*
 	@echo "[cargo] $@ ($<)"
 	$(_@)mkdir -p $(OUT_DIR)
 	$(_@)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
 
 .PRECIOUS: $(OUT_DIR)/%.o