From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 May 2022 22:06:27 +0000 (+0100)
Subject: Makefile: Always run miri on nightly
X-Git-Tag: otter-1.1.0~253
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a8717f09ac8b50fbe75b5bedfb7d454d2afaab2a;p=otter.git

Makefile: Always run miri on nightly

It's not stable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index e3244374..45c8f096 100644
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,7 @@ WASM := wasm32-unknown-unknown
 # ?  But maybe it doesn't matter since we're very conservative and
 # only pass JsValue and a few strings across the WASM ABI.
 
+RUST_NIGHTLY_VERSION ?= +nightly
 CARGO = $(CARGO_CMD) $(RUST_VERSION)
 
 #---------- toplevel aggregate targets ----------
@@ -223,7 +224,8 @@ stamp/cargo.%-check: $(call rsrcs,.)
 	$(stamp)
 
 stamp/cargo.%-miri: $(call rsrcs,.)
-	$(CARGO) miri test --workspace $(call cr,$*)
+	$(CARGO_CMD) $(RUST_NIGHTLY_VERSION) \
+		miri test --workspace $(call cr,$*)
 	$(stamp)
 
 stamp/cargo-at.debug: $(call rsrcs,.)