fix disable jit builds, better comment

Author: XrXr

configure.ac

@@ -4023,6 +4023,9 @@ AS_IF([test -n "$RUST_LIB"], [
         # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by rust stdlib
         LDFLAGS="$LDFLAGS -lpthread -lc++abi"
     ])
+
+    # absolute path to stop the "target" dir in src dir from interfering through VPATH
+    RUST_LIB="$(pwd)/${RUST_LIB}"
 ])
 
 dnl These variables end up in ::RbConfig::CONFIG

template/Makefile.in

@@ -112,8 +112,7 @@ ZJIT_OBJ=@ZJIT_OBJ@
 RUST_JIT_SUPPORT=@RUST_JIT_SUPPORT@
 CARGO_TARGET_DIR=@abs_top_builddir@/target
 CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
-# absolute path to stop the "target" dir in src dir from interfering through VPATH
-RUST_LIB=@abs_top_builddir@/@RUST_LIB@
+RUST_LIB=@RUST_LIB@
 RUST_LIBOBJ = $(RUST_LIB:.a=.@OBJEXT@)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXE_LDFLAGS = $(LDFLAGS)

yjit/yjit.mk

@@ -19,6 +19,8 @@ YJIT_SRC_FILES = $(wildcard \
 # rebuild at the next build.
 YJIT_LIB_TOUCH = touch $@
 
+# Absolute path to match RUST_LIB rules to avoid picking
+# the "target" dir in the source directory through VPATH.
 BUILD_YJIT_LIBS = $(TOP_BUILD_DIR)/$(YJIT_LIBS)
 
 # YJIT_SUPPORT=yes when `configure` gets `--enable-yjit`
@@ -32,13 +34,8 @@ else ifeq ($(YJIT_SUPPORT),no)
 $(BUILD_YJIT_LIBS):
 	$(ECHO) 'Error: Tried to build YJIT without configuring it first. Check `make showconfig`?'
 	@false
-else
 endif
 
-
-#TODO(alan) alias to rust-libobj?
-# yjit-libobj: $(YJIT_LIBOBJ)
-
 # By using YJIT_BENCH_OPTS instead of RUN_OPTS, you can skip passing the options to `make install`
 YJIT_BENCH_OPTS = $(RUN_OPTS) --enable-gems
 YJIT_BENCH = benchmarks/railsbench/benchmark.rb

zjit/zjit.mk

@@ -19,30 +19,20 @@ ZJIT_SRC_FILES = $(wildcard \
 # rebuild at the next build.
 ZJIT_LIB_TOUCH = touch $@
 
+# Absolute path to match RUST_LIB rules to avoid picking
+# the "target" dir in the source directory through VPATH.
+BUILD_ZJIT_LIBS = $(TOP_BUILD_DIR)/$(ZJIT_LIBS)
+
 # ZJIT_SUPPORT=yes when `configure` gets `--enable-zjit`
 ifeq ($(ZJIT_SUPPORT),yes)
-$(ZJIT_LIBS): $(ZJIT_SRC_FILES)
+$(BUILD_ZJIT_LIBS): $(ZJIT_SRC_FILES)
 	$(ECHO) 'building Rust ZJIT (release mode)'
 	+$(Q) $(RUSTC) $(ZJIT_RUSTC_ARGS)
 	$(ZJIT_LIB_TOUCH)
 else ifeq ($(ZJIT_SUPPORT),no)
-$(ZJIT_LIBS):
+$(BUILD_ZJIT_LIBS):
 	$(ECHO) 'Error: Tried to build ZJIT without configuring it first. Check `make showconfig`?'
 	@false
-else ifeq ($(ZJIT_SUPPORT),$(filter dev dev_nodebug stats,$(ZJIT_SUPPORT)))
-# NOTE: MACOSX_DEPLOYMENT_TARGET to match `rustc --print deployment-target` to avoid the warning below.
-#    ld: warning: object file (zjit/target/debug/libzjit.a(<libcapstone object>)) was built for
-#    newer macOS version (15.2) than being linked (15.0)
-# We don't use newer macOS feature as of yet.
-$(ZJIT_LIBS): $(ZJIT_SRC_FILES)
-	$(ECHO) 'building Rust ZJIT ($(ZJIT_SUPPORT) mode)'
-	+$(Q)$(CHDIR) $(top_srcdir)/zjit && \
-	        CARGO_TARGET_DIR='$(ZJIT_CARGO_TARGET_DIR)' \
-	        CARGO_TERM_PROGRESS_WHEN='never' \
-	        MACOSX_DEPLOYMENT_TARGET=11.0 \
-	        $(CARGO) $(CARGO_VERBOSE) build $(ZJIT_CARGO_BUILD_ARGS)
-	$(ZJIT_LIB_TOUCH)
-else
 endif
 
 # By using ZJIT_BENCH_OPTS instead of RUN_OPTS, you can skip passing the options to `make install`