wip

Author: XrXr

Cargo.lock

@@ -14,6 +14,7 @@ jit = { version = "0.1.0", path = "../jit" }
 [dev-dependencies]
 insta = "1.43.1"
 rand = "0.9"
+yjit = { path = "../yjit" }
 
 # NOTE: Development builds select a set of these via configure.ac
 # For debugging, `make V=1` shows exact cargo invocation.

zjit/Cargo.toml

@@ -25,13 +25,5 @@ fn main() {
                 println!("cargo:rustc-link-lib={lib_name}");
             }
         }
-
-        // When doing a combo build, there is a copy of ZJIT symbols in libruby.a
-        // and Cargo builds another copy for the test binary. Tell the linker to
-        // not complaint about duplicate symbols. For some reason, darwin doesn't
-        // suffer the same issue.
-        if env::var("TARGET").unwrap().contains("linux") {
-            println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
-        }
     }
 }

zjit/build.rs

@@ -32,3 +32,7 @@ mod gc;
 mod payload;
 mod json;
 mod ttycolors;
+
+//
+#[cfg(test)]
+use yjit as _;

zjit/src/lib.rs

@@ -133,7 +133,7 @@ zjit-test-rr: libminiruby.a
 libminiruby.a: miniruby$(EXEEXT)
 	$(ECHO) linking static-library $@
 	$(Q) $(RM) $@
-	$(Q) $(AR) $(ARFLAGS) $@ $(MINIOBJS) $(COMMONOBJS)
+	$(Q) $(AR) $(ARFLAGS) $@ $(MINIOBJS) $(COMMONOBJS:$(RUST_LIBOBJ)=)
 
 libminiruby: libminiruby.a