rustc only builds, openbsd duplicate fix

Author: XrXr

common.mk

@@ -353,7 +353,7 @@ ZJIT_RUSTC_ARGS = --crate-name=zjit \
 	-C lto=thin \
 	-C opt-level=3 \
 	-C overflow-checks=on \
-	'--out-dir=$(ZJIT_CARGO_TARGET_DIR)/release/' \
+	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
 	$(top_srcdir)/zjit/src/lib.rs
 
 all: $(SHOWFLAGS) main

configure.ac

@@ -3926,6 +3926,7 @@ AC_ARG_ENABLE(yjit,
 CARGO=
 CARGO_BUILD_ARGS=
 YJIT_LIBS=
+RUST_JIT_SUPPORT=no
 AS_CASE(["${YJIT_SUPPORT}"],
 [yes|dev|stats|dev_nodebug], [
     AS_IF([test x"$RUSTC" = "xno"],
@@ -3934,37 +3935,24 @@ AS_CASE(["${YJIT_SUPPORT}"],
 
     AS_CASE(["${YJIT_SUPPORT}"],
     [yes], [
-	rb_rust_target_subdir=release
     ],
     [dev], [
-	rb_rust_target_subdir=debug
-	CARGO_BUILD_ARGS='--features disasm,runtime_checks'
+        rb_cargo_features='disasm,runtime_checks'
+        RUST_JIT_SUPPORT=dev
 	AC_DEFINE(RUBY_DEBUG, 1)
     ],
     [dev_nodebug], [
-	rb_rust_target_subdir=dev_nodebug
-	CARGO_BUILD_ARGS='--profile dev_nodebug --features disasm'
+        rb_cargo_features='disasm'
+        RUST_JIT_SUPPORT=dev_nodebug
 	AC_DEFINE(YJIT_STATS, 1)
     ],
     [stats], [
-	rb_rust_target_subdir=stats
-	CARGO_BUILD_ARGS='--profile stats'
+        RUST_JIT_SUPPORT=stats
 	AC_DEFINE(YJIT_STATS, 1)
     ])
 
-    AS_IF([test -n "${CARGO_BUILD_ARGS}"], [
-             AC_CHECK_TOOL(CARGO, [cargo], [no])
-             AS_IF([test x"$CARGO" = "xno"],
-                AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install])
-             ]))
-
-    YJIT_LIBS="target/${rb_rust_target_subdir}/libyjit.a"
+    YJIT_LIBS="target/release/libyjit.a"
     RUST_LIB='$(YJIT_LIBS)'
-    RUST_JIT_SUPPORT="yjit"
-    AS_CASE(["$target_os"],[openbsd*],[
-        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by yjit
-        LDFLAGS="$LDFLAGS -lpthread -lc++abi"
-    ])
     YJIT_OBJ='yjit.$(OBJEXT)'
     JIT_OBJ='jit.$(OBJEXT)'
     AS_IF([test x"$YJIT_SUPPORT" != "xyes" ], [
@@ -3984,37 +3972,16 @@ AS_CASE(["${ZJIT_SUPPORT}"],
 
     AS_CASE(["${ZJIT_SUPPORT}"],
     [yes], [
-	rb_rust_target_subdir=release
     ],
     [dev], [
-	rb_rust_target_subdir=debug
-	CARGO_BUILD_ARGS="${CARGO_BUILD_ARGS} --profile dev --features disasm,zjit"
+        RUST_JIT_SUPPORT=dev
 	AC_DEFINE(RUBY_DEBUG, 1)
     ])
 
-dnl TODO(alan): for commit message: note that for combo builds, when one is in dev mode everyone is in dev mode.
-    AS_IF([test -n "${CARGO_BUILD_ARGS}" -o x"$YJIT_SUPPORT" != "xno"], [dnl YJIT+ZJIT build
-        AC_CHECK_TOOL(CARGO, [cargo], [no])
-        AS_IF([test x"$CARGO" = "xno"],
-              AC_MSG_ERROR([failed to find "cargo" for building YJIT and ZJIT together]))
-        YJIT_LIBS=
-        ZJIT_LIBS=
-        # default when CARGO_BUILD_ARGS is not set
-        CARGO_BUILD_ARGS="${CARGO_BUILD_ARGS:---release --features yjit,zjit}"
-        RUST_LIB="target/${rb_rust_target_subdir}/libjit.a"
-        RUST_JIT_SUPPORT="$ZJIT_SUPPORT"
-    ], [
-        ZJIT_LIBS="target/${rb_rust_target_subdir}/libzjit.a"
-        RUST_LIB='$(ZJIT_LIBS)'
-        RUST_JIT_SUPPORT="zjit"
-    ])
-
+    ZJIT_LIBS="target/release/libzjit.a"
+    RUST_LIB='$(ZJIT_LIBS)'
     ZJIT_OBJ='zjit.$(OBJEXT)'
     JIT_OBJ='jit.$(OBJEXT)'
-    AS_CASE(["$target_os"],[openbsd*],[
-        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by yjit
-        LDFLAGS="$LDFLAGS -lpthread -lc++abi"
-    ])
     AS_IF([test x"$ZJIT_SUPPORT" != "xyes" ], [
         AC_DEFINE_UNQUOTED(ZJIT_SUPPORT, [$ZJIT_SUPPORT])
     ])
@@ -4023,6 +3990,41 @@ dnl TODO(alan): for commit message: note that for combo builds, when one is in d
     AC_DEFINE(USE_ZJIT, 0)
 ])
 
+# if YJIT+ZJIT release build, or any build that requires Cargo
+AS_IF([test x"$RUST_JIT_SUPPORT" != "xno" -o \( x"$YJIT_SUPPORT" != "xno" -a x"$ZJIT_SUPPORT" != "xno" \)], [
+    AC_CHECK_TOOL(CARGO, [cargo], [no])
+    AS_IF([test x"$CARGO" = "xno"],
+        AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install]))
+
+    YJIT_LIBS=
+    ZJIT_LIBS=
+
+    AS_IF([test x"${YJIT_SUPPORT}" != x"no"], [
+        rb_cargo_features="$rb_cargo_features,yjit"
+    ])
+    AS_IF([test x"${ZJIT_SUPPORT}" != x"no"], [
+        rb_cargo_features="$rb_cargo_features,zjit"
+    ])
+    # if YJIT and ZJIT release mode
+    AS_IF([test "${YJIT_SUPPORT}:${ZJIT_SUPPORT}" = "yes:yes"], [
+        RUST_JIT_SUPPORT=release
+    ])
+    CARGO_BUILD_ARGS="--profile ${RUST_JIT_SUPPORT} --features ${rb_cargo_features}"
+    AS_IF([test "${RUST_JIT_SUPPORT}" = "dev"], [
+        RUST_LIB="target/debug/libjit.a"
+    ], [
+        RUST_LIB="target/${RUST_JIT_SUPPORT}/libjit.a"
+    ])
+])
+
+# In case either we're linking rust code
+AS_IF([test -n "$RUST_LIB"], [
+    AS_CASE(["$target_os"],[openbsd*],[
+        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by rust stdlib
+        LDFLAGS="$LDFLAGS -lpthread -lc++abi"
+    ])
+])
+
 dnl These variables end up in ::RbConfig::CONFIG
 AC_SUBST(RUSTC)dnl Rust compiler command
 AC_SUBST(CARGO)dnl Cargo command for Rust builds

defs/gmake.mk

@@ -450,7 +450,7 @@ include $(top_srcdir)/zjit/zjit.mk
 # rebuild at the next build.
 RUST_LIB_TOUCH = touch $@
 
-ifeq ($(RUST_JIT_SUPPORT),$(filter yes dev dev_nodebug stats,$(RUST_JIT_SUPPORT)))
+ifneq ($(RUST_JIT_SUPPORT),no)
 $(RUST_LIB):
 	$(Q)if [ '$(ZJIT_SUPPORT)' != no -a '$(YJIT_SUPPORT)' != no ]; then \
 	    echo 'building YJIT and ZJIT ($(RUST_JIT_SUPPORT:yes=release) mode)'; \

template/Makefile.in

@@ -110,9 +110,9 @@ ZJIT_SUPPORT=@ZJIT_SUPPORT@
 ZJIT_LIBS=@ZJIT_LIBS@
 ZJIT_OBJ=@ZJIT_OBJ@
 RUST_JIT_SUPPORT=@RUST_JIT_SUPPORT@
-CARGO_TARGET_DIR=@abs_top_builddir@/target
+CARGO_TARGET_DIR=@top_builddir@/target
 CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
-RUST_LIB=@abs_top_builddir@/@RUST_LIB@
+RUST_LIB=@top_builddir@/@RUST_LIB@
 RUST_LIBOBJ = $(RUST_LIB:.a=.@OBJEXT@)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXE_LDFLAGS = $(LDFLAGS)