combo print, only build one when cargo

Author: XrXr

Cargo.toml

@@ -13,8 +13,8 @@ rust-version = "1.85.0"
 publish = false # Don't publish to crates.io
 
 [dependencies]
-yjit = { path = "yjit" }
-zjit = { path = "zjit" }
+yjit = { path = "yjit", optional = true }
+zjit = { path = "zjit", optional = true }
 
 [lib]
 crate-type = ["staticlib"]
@@ -23,8 +23,8 @@ path = "jit.rs"
 [features]
 disasm = []
 runtime_checks = []
-yjit = []
-zjit = []
+yjit = [ "dep:yjit" ]
+zjit = [ "dep:zjit" ]
 
 [profile.dev]
 opt-level = 0

defs/gmake.mk

@@ -452,9 +452,11 @@ RUST_LIB_TOUCH = touch $@
 
 ifeq ($(RUST_JIT_SUPPORT),$(filter yes dev dev_nodebug stats,$(RUST_JIT_SUPPORT)))
 $(RUST_LIB):
-	$(Q)if [ $(ZJIT_SUPPORT) != no ]; then \
+	$(Q)if [ '$(ZJIT_SUPPORT)' != no -a '$(YJIT_SUPPORT)' != no ]; then \
+	    echo 'building YJIT and ZJIT ($(RUST_JIT_SUPPORT:yes=release) mode)'; \
+	elif [ '$(ZJIT_SUPPORT)' != no ]; then \
 	    echo 'building ZJIT ($(RUST_JIT_SUPPORT) mode)'; \
-	elif [ $(YJIT_SUPPORT) != no ]; then \
+	elif [ '$(YJIT_SUPPORT)' != no ]; then \
 	    echo 'building YJIT ($(RUST_JIT_SUPPORT) mode)'; \
 	fi
 	+$(Q)CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \