From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Mar 2021 12:59:21 +0000 (+0000)
Subject: Makefile: Do not use --workspace for DEPLOY build
X-Git-Tag: otter-0.4.0^0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f92c31cd09cf0dd4b9ff6e27211ef18b08df5ea7;p=otter.git

Makefile: Do not use --workspace for DEPLOY build

This makes it try to build a musl cdylib for otter-wasm, which it
can't.  There doesn't seem to be a way to exclude this from cargo.

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

diff --git a/Makefile b/Makefile
index e08c9c72..b6e97ad3 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ stamp/cargo.wasm-%: $(call rsrcs, base wasm Cargo.*)
 	$(stamp)
 
 stamp/cargo.deploy-build: $(call rsrcs,.)
-	$(CARGO) -T$(DEPLOY_ARCH) build --workspace $(call cr,$(DEPLOY_RELEASE)) -p otter -p otter-daemon
+	$(CARGO) -T$(DEPLOY_ARCH) build $(call cr,$(DEPLOY_RELEASE)) -p otter -p otter-daemon
 	$(stamp)
 
 #---------- wasm ----------