From 48f54b8aee5a7b5c937954a43a6f620d08d1d0e0 Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Thu, 12 Dec 2024 01:57:30 +0000
Subject: [PATCH 1/9] Updating julia_version

---
 mmtk/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index fd4b5e7d..83d8359d 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
 julia_repo = "https://github.com/mmtk/julia.git"
-julia_version = "b2f2d3c486739f20e4eb5500f3ad7b1866122fce"
+julia_version = "3124e4e1c50dfb24161366474868507c2f6f186d"
 
 [lib]
 crate-type = ["cdylib"]

From 37d47d67d1e87d979f69fe9f1db0aabfa4654f3f Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 01:26:17 +0000
Subject: [PATCH 2/9] Adding makefile that enables building Julia from binding
 (wip)

---
 Makefile      | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++
 julia.version |  3 +++
 2 files changed, 74 insertions(+)
 create mode 100644 Makefile
 create mode 100644 julia.version

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..cf3a8320
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,71 @@
+# By default do a release build with moving immix
+MMTK_MOVING ?= 1
+MMTK_PLAN ?= Immix
+CURR_PATH := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
+include $(CURR_PATH)/julia.version
+
+# If the Julia directory doesn't exist
+# Clone it as a sibling of mmtk-julia
+JULIA_PATH ?= $(CURR_PATH)../julia
+MMTK_JULIA_DIR := $(CURR_PATH)
+
+PROJECT_DIRS := JULIA_PATH=$(JULIA_PATH) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR)
+MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING:=$(MMTK_MOVING)
+
+ifeq (${MMTK_PLAN},Immix)
+CARGO_FEATURES = immix
+else ifeq (${MMTK_PLAN},StickyImmix)
+CARGO_FEATURES = stickyimmix
+else
+$(error "Unsupported MMTk plan: $(MMTK_PLAN)")
+endif
+
+ifeq ($(MMTK_MOVING), 0)
+CARGO_FEATURES += non_moving
+endif
+
+# Clone the repository if the directory does not exist
+clone-julia:
+	@if [ ! -d "$(JULIA_PATH)" ]; then \
+		echo "Cloning repository from $(JULIA_GIT_URL)"; \
+		git clone $(JULIA_GIT_URL) $(JULIA_PATH) --quiet; \
+		cd $(JULIA_PATH) && \
+		if git checkout $(JULIA_SHA1) --quiet; then \
+			echo "Checked out commit $(JULIA_SHA1)"; \
+		else \
+			echo "Commit $(JULIA_SHA1) not found. Checking out tip of branch $(JULIA_BRANCH) instead."; \
+			git checkout $(JULIA_BRANCH) --quiet; \
+		fi; \
+	else \
+		echo "Directory $(JULIA_PATH) already exists. Skipping clone."; \
+	fi
+
+# Build the mmtk-julia project
+# Note that we might need to clone julia if it doesn't exist  
+# since we need to run bindgen as part of building mmtk-julia
+binding: clone-julia
+	@echo "Building the Rust project in $(MMTK_JULIA_DIR)mmtk";
+	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) --release
+
+binding-debug: clone-julia
+	@echo "Building the Rust project in $(MMTK_JULIA_DIR) using a debug build";
+	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) 
+
+# Build the Julia project (which will build the binding as part of their deps build)
+julia: clone-julia
+	@echo "Building the Julia project in $(JULIA_PATH)";
+	@cd $(JULIA_PATH) && $(MMTK_VARS) make
+
+# Build the Julia project using a debug build (which will do a binding-debug as part of their deps build)
+julia-debug: clone-julia
+	@echo "Building the Julia project in $(JULIA_PATH)";
+	@cd $(JULIA_PATH) && $(MMTK_VARS) make debug
+
+# Clean up the build artifacts
+clean:
+	@echo "Cleaning up build artifacts in $(JULIA_PATH) and $(MMTK_JULIA_DIR)";
+	@cd $(JULIA_PATH) && make clean
+	@cd $(MMTK_JULIA_DIR)mmtk && cargo clean
+
+.PHONY: clone-julia binding binding-debug julia julia-debug
diff --git a/julia.version b/julia.version
new file mode 100644
index 00000000..1fca2d0a
--- /dev/null
+++ b/julia.version
@@ -0,0 +1,3 @@
+JULIA_BRANCH = upstream-ready/immix
+JULIA_SHA1 = 3124e4e1c50dfb24161366474868507c2f6f186d
+JULIA_GIT_URL := https://github.com/mmtk/julia.git

From db1ab2ee0c7faa35bf9869c3de6d9d502d146aac Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 14:48:51 +1100
Subject: [PATCH 3/9] Update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cf3a8320..3250ec9d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ $(error "Unsupported MMTk plan: $(MMTK_PLAN)")
 endif
 
 ifeq ($(MMTK_MOVING), 0)
-CARGO_FEATURES += non_moving
+CARGO_FEATURES +=,non_moving
 endif
 
 # Clone the repository if the directory does not exist

From c6a3804a2a4fa701ee8a207971fcb9b7cf189f4e Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 15:00:11 +1100
Subject: [PATCH 4/9] Update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3250ec9d..b9c78ef1 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ $(error "Unsupported MMTk plan: $(MMTK_PLAN)")
 endif
 
 ifeq ($(MMTK_MOVING), 0)
-CARGO_FEATURES +=,non_moving
+CARGO_FEATURES := $(CARGO_FEATURES),non_moving
 endif
 
 # Clone the repository if the directory does not exist

From 3c9c3b8ee87b6d2de3111bfaa341a379e8eeb26c Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 15:00:32 +1100
Subject: [PATCH 5/9] Update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b9c78ef1..e6f77929 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ JULIA_PATH ?= $(CURR_PATH)../julia
 MMTK_JULIA_DIR := $(CURR_PATH)
 
 PROJECT_DIRS := JULIA_PATH=$(JULIA_PATH) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR)
-MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING:=$(MMTK_MOVING)
+MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
 
 ifeq (${MMTK_PLAN},Immix)
 CARGO_FEATURES = immix

From d0d69b28992e870ecd8239a1fd3261351628c83e Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 10:09:11 +0000
Subject: [PATCH 6/9] Don't run make deps inside bindgen when the files already
 exist (e.g. via Makefile)

---
 Makefile      | 14 +++++++-------
 julia.version |  6 +++---
 mmtk/build.rs | 30 +++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index e6f77929..7ae65bae 100644
--- a/Makefile
+++ b/Makefile
@@ -38,29 +38,29 @@ clone-julia:
 			git checkout $(JULIA_BRANCH) --quiet; \
 		fi; \
 	else \
-		echo "Directory $(JULIA_PATH) already exists. Skipping clone."; \
+		echo "Directory $(JULIA_PATH) already exists. Skipping clone-julia."; \
 	fi
 
 # Build the mmtk-julia project
 # Note that we might need to clone julia if it doesn't exist  
 # since we need to run bindgen as part of building mmtk-julia
-binding: clone-julia
+release: clone-julia
 	@echo "Building the Rust project in $(MMTK_JULIA_DIR)mmtk";
 	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) --release
 
-binding-debug: clone-julia
+debug: clone-julia
 	@echo "Building the Rust project in $(MMTK_JULIA_DIR) using a debug build";
 	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) 
 
 # Build the Julia project (which will build the binding as part of their deps build)
 julia: clone-julia
 	@echo "Building the Julia project in $(JULIA_PATH)";
-	@cd $(JULIA_PATH) && $(MMTK_VARS) make
+	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make
 
-# Build the Julia project using a debug build (which will do a binding-debug as part of their deps build)
+# Build the Julia project using a debug build (which will do a binding-debug build as part of their deps build)
 julia-debug: clone-julia
 	@echo "Building the Julia project in $(JULIA_PATH)";
-	@cd $(JULIA_PATH) && $(MMTK_VARS) make debug
+	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make debug
 
 # Clean up the build artifacts
 clean:
@@ -68,4 +68,4 @@ clean:
 	@cd $(JULIA_PATH) && make clean
 	@cd $(MMTK_JULIA_DIR)mmtk && cargo clean
 
-.PHONY: clone-julia binding binding-debug julia julia-debug
+.PHONY: clone-julia release debug julia julia-debug clean
diff --git a/julia.version b/julia.version
index 1fca2d0a..6b402f0e 100644
--- a/julia.version
+++ b/julia.version
@@ -1,3 +1,3 @@
-JULIA_BRANCH = upstream-ready/immix
-JULIA_SHA1 = 3124e4e1c50dfb24161366474868507c2f6f186d
-JULIA_GIT_URL := https://github.com/mmtk/julia.git
+JULIA_BRANCH = add-makefile-support
+JULIA_SHA1 = 67f3f87f5e05ce9242eef079181ed4d7471a1507
+JULIA_GIT_URL := https://github.com/udesou/julia.git
diff --git a/mmtk/build.rs b/mmtk/build.rs
index b8adc648..85cbb390 100644
--- a/mmtk/build.rs
+++ b/mmtk/build.rs
@@ -1,4 +1,5 @@
 extern crate bindgen;
+use std::path::Path;
 
 // Use bindgen to build Rust bindings for Julia
 
@@ -13,17 +14,28 @@ fn main() {
     };
 
     // running `make julia_version.h` in $JULIA_PATH/src to generate julia_version.h
-    std::process::Command::new("make")
-        .current_dir(format!("{}/src", julia_dir))
-        .args(["julia_version.h"])
-        .output()
-        .expect("failed to execute process");
+    if !Path::new(format!("{}/src/julia_version.h", julia_dir).as_str()).exists() {
+        std::process::Command::new("make")
+            .current_dir(format!("{}/src", julia_dir))
+            .args(["julia_version.h"])
+            .output()
+            .expect("failed to execute process");
+    }
 
     // runing `make` in $JULIA_PATH/deps to generate $JULIA_PATH/usr/include, in particular libunwind.h
-    std::process::Command::new("make")
-        .current_dir(format!("{}/deps", julia_dir))
-        .output()
-        .expect("failed to execute process");
+    // skip this process if that path already exists since
+    // the .h files could have already beeen generated when building via Makefile
+    if !Path::new(format!("{}/usr/include", julia_dir).as_str()).exists() {
+        println!(
+            "WARNING: running make inside {}/deps to generate the necessary .h files!",
+            julia_dir
+        );
+        std::process::Command::new("make")
+            .current_dir(format!("{}/deps", julia_dir))
+            .env("MMTK_PLAN", "None") // Make sure this call doesn't try to compile the binding again
+            .output()
+            .expect("failed to execute process");
+    }
 
     let bindings = bindgen::Builder::default()
         .header(format!("{}/src/julia.h", julia_dir))

From c2a1acd8b5f6b92b445d316563a6f87e30f04acf Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Fri, 13 Dec 2024 11:26:48 +0000
Subject: [PATCH 7/9] Updating Cargo.toml

---
 Makefile        | 14 ++++++++------
 julia.version   |  3 ---
 mmtk/Cargo.toml |  4 ++--
 mmtk/build.rs   | 17 ++++++++++++++---
 4 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 julia.version

diff --git a/Makefile b/Makefile
index 7ae65bae..b35f49d1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ MMTK_MOVING ?= 1
 MMTK_PLAN ?= Immix
 CURR_PATH := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-include $(CURR_PATH)/julia.version
+# Getting metadata about Julia repo from Cargo file
+JULIA_GIT_URL= $(shell cargo read-manifest --manifest-path=$(CURR_PATH)/mmtk/Cargo.toml | python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["julia"]["julia_repo"])')
+JULIA_VERSION= $(shell cargo read-manifest --manifest-path=$(CURR_PATH)/mmtk/Cargo.toml | python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["julia"]["julia_version"])')
 
 # If the Julia directory doesn't exist
 # Clone it as a sibling of mmtk-julia
@@ -31,11 +33,11 @@ clone-julia:
 		echo "Cloning repository from $(JULIA_GIT_URL)"; \
 		git clone $(JULIA_GIT_URL) $(JULIA_PATH) --quiet; \
 		cd $(JULIA_PATH) && \
-		if git checkout $(JULIA_SHA1) --quiet; then \
-			echo "Checked out commit $(JULIA_SHA1)"; \
+		if git checkout $(JULIA_VERSION) --quiet; then \
+			echo "Checked out commit $(JULIA_VERSION)"; \
 		else \
-			echo "Commit $(JULIA_SHA1) not found. Checking out tip of branch $(JULIA_BRANCH) instead."; \
-			git checkout $(JULIA_BRANCH) --quiet; \
+			echo "Error: Commit $(GIT_COMMIT) does not exist."; \
+			exit 1; \
 		fi; \
 	else \
 		echo "Directory $(JULIA_PATH) already exists. Skipping clone-julia."; \
@@ -57,7 +59,7 @@ julia: clone-julia
 	@echo "Building the Julia project in $(JULIA_PATH)";
 	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make
 
-# Build the Julia project using a debug build (which will do a binding-debug build as part of their deps build)
+# Build the Julia project using a debug build (which will do a release build of the binding, unless MMTK_BUILD=debug)
 julia-debug: clone-julia
 	@echo "Building the Julia project in $(JULIA_PATH)";
 	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make debug
diff --git a/julia.version b/julia.version
deleted file mode 100644
index 6b402f0e..00000000
--- a/julia.version
+++ /dev/null
@@ -1,3 +0,0 @@
-JULIA_BRANCH = add-makefile-support
-JULIA_SHA1 = 67f3f87f5e05ce9242eef079181ed4d7471a1507
-JULIA_GIT_URL := https://github.com/udesou/julia.git
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 83d8359d..0f2f4986 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2018"
 # Metadata for the Julia repository
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
-julia_repo = "https://github.com/mmtk/julia.git"
-julia_version = "3124e4e1c50dfb24161366474868507c2f6f186d"
+julia_repo = "https://github.com/udesou/julia.git"
+julia_version = "e15a1083de5118b9c4f82018fa4d55b2a8ca818d"
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/mmtk/build.rs b/mmtk/build.rs
index 85cbb390..ee4d219f 100644
--- a/mmtk/build.rs
+++ b/mmtk/build.rs
@@ -7,16 +7,26 @@ fn main() {
     // Use environment variable $JULIA_PATH that points to Julia folder
     let julia_dir_key = "JULIA_PATH";
     let mmtk_dir_key = "MMTK_JULIA_DIR";
+    let buildroot_dir_key = "JULIA_BUILDROOT";
 
     let (mmtk_dir, julia_dir) = match (std::env::var(mmtk_dir_key), std::env::var(julia_dir_key)) {
         (Ok(mmtk_val), Ok(julia_val)) => (mmtk_val, julia_val),
         _ => panic!("Must set {} and {}", julia_dir_key, mmtk_dir_key),
     };
 
+    // A build call from Julia's Makefile may build into a different directory
+    // e.g., via make O=/path-to-my-build/my-julia-build
+    // Check if JULIA_BUILD_ROOT is set and use it, otherwise, set it as the same dir as JULIA_PATH
+    let buildroot_dir = match std::env::var(buildroot_dir_key) {
+        Ok(buildroot_val) => buildroot_val,
+        _ => julia_dir.clone(),
+    };
+
     // running `make julia_version.h` in $JULIA_PATH/src to generate julia_version.h
-    if !Path::new(format!("{}/src/julia_version.h", julia_dir).as_str()).exists() {
+    if !Path::new(format!("{}/src/julia_version.h", buildroot_dir).as_str()).exists() {
         std::process::Command::new("make")
             .current_dir(format!("{}/src", julia_dir))
+            .env("BUILDDIR", buildroot_dir.clone())
             .args(["julia_version.h"])
             .output()
             .expect("failed to execute process");
@@ -25,13 +35,14 @@ fn main() {
     // runing `make` in $JULIA_PATH/deps to generate $JULIA_PATH/usr/include, in particular libunwind.h
     // skip this process if that path already exists since
     // the .h files could have already beeen generated when building via Makefile
-    if !Path::new(format!("{}/usr/include", julia_dir).as_str()).exists() {
+    if !Path::new(format!("{}/usr/include", buildroot_dir).as_str()).exists() {
         println!(
             "WARNING: running make inside {}/deps to generate the necessary .h files!",
             julia_dir
         );
         std::process::Command::new("make")
             .current_dir(format!("{}/deps", julia_dir))
+            .env("BUILDDIR", buildroot_dir.clone())
             .env("MMTK_PLAN", "None") // Make sure this call doesn't try to compile the binding again
             .output()
             .expect("failed to execute process");
@@ -48,7 +59,7 @@ fn main() {
         .clang_arg("-I")
         .clang_arg(format!("{}/src/support", julia_dir))
         .clang_arg("-I")
-        .clang_arg(format!("{}/usr/include", julia_dir))
+        .clang_arg(format!("{}/usr/include", buildroot_dir))
         // all types that we generate bindings from
         .allowlist_item("jl_datatype_layout_t")
         .allowlist_item("jl_ucontext_t")

From c941fea8debf43aa30714e25ff062e8838ffa518 Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Mon, 16 Dec 2024 05:26:31 +0000
Subject: [PATCH 8/9] Updating julia_version

---
 Makefile        | 35 +++++++++++------------------------
 mmtk/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index b35f49d1..30495bdb 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,12 @@ CURR_PATH := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 JULIA_GIT_URL= $(shell cargo read-manifest --manifest-path=$(CURR_PATH)/mmtk/Cargo.toml | python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["julia"]["julia_repo"])')
 JULIA_VERSION= $(shell cargo read-manifest --manifest-path=$(CURR_PATH)/mmtk/Cargo.toml | python -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["julia"]["julia_version"])')
 
-# If the Julia directory doesn't exist
-# Clone it as a sibling of mmtk-julia
-JULIA_PATH ?= $(CURR_PATH)../julia
+# If the Julia directory doesn't exist throw an error
+# since we need it to generate the bindgen bindings
+ifeq (${JULIA_PATH},)
+$(error "JULIA_PATH must be set to generate Rust bindings")
+endif
+
 MMTK_JULIA_DIR := $(CURR_PATH)
 
 PROJECT_DIRS := JULIA_PATH=$(JULIA_PATH) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR)
@@ -27,40 +30,24 @@ ifeq ($(MMTK_MOVING), 0)
 CARGO_FEATURES := $(CARGO_FEATURES),non_moving
 endif
 
-# Clone the repository if the directory does not exist
-clone-julia:
-	@if [ ! -d "$(JULIA_PATH)" ]; then \
-		echo "Cloning repository from $(JULIA_GIT_URL)"; \
-		git clone $(JULIA_GIT_URL) $(JULIA_PATH) --quiet; \
-		cd $(JULIA_PATH) && \
-		if git checkout $(JULIA_VERSION) --quiet; then \
-			echo "Checked out commit $(JULIA_VERSION)"; \
-		else \
-			echo "Error: Commit $(GIT_COMMIT) does not exist."; \
-			exit 1; \
-		fi; \
-	else \
-		echo "Directory $(JULIA_PATH) already exists. Skipping clone-julia."; \
-	fi
-
 # Build the mmtk-julia project
 # Note that we might need to clone julia if it doesn't exist  
 # since we need to run bindgen as part of building mmtk-julia
-release: clone-julia
+release:
 	@echo "Building the Rust project in $(MMTK_JULIA_DIR)mmtk";
 	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) --release
 
-debug: clone-julia
+debug:
 	@echo "Building the Rust project in $(MMTK_JULIA_DIR) using a debug build";
 	@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) 
 
 # Build the Julia project (which will build the binding as part of their deps build)
-julia: clone-julia
+julia:
 	@echo "Building the Julia project in $(JULIA_PATH)";
 	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make
 
 # Build the Julia project using a debug build (which will do a release build of the binding, unless MMTK_BUILD=debug)
-julia-debug: clone-julia
+julia-debug:
 	@echo "Building the Julia project in $(JULIA_PATH)";
 	@cd $(JULIA_PATH) && $(PROJECT_DIRS) $(MMTK_VARS) make debug
 
@@ -70,4 +57,4 @@ clean:
 	@cd $(JULIA_PATH) && make clean
 	@cd $(MMTK_JULIA_DIR)mmtk && cargo clean
 
-.PHONY: clone-julia release debug julia julia-debug clean
+.PHONY: release debug julia julia-debug clean
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 0f2f4986..ce7ef2c2 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
 julia_repo = "https://github.com/udesou/julia.git"
-julia_version = "e15a1083de5118b9c4f82018fa4d55b2a8ca818d"
+julia_version = "5f743032000a5ac85d18a64e3c6992e3b8e0f0bc"
 
 [lib]
 crate-type = ["cdylib"]

From 91f7764906994c3df57efd6d2c21121fdd3b6d32 Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Mon, 16 Dec 2024 23:45:22 +0000
Subject: [PATCH 9/9] Minor

---
 mmtk/build.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mmtk/build.rs b/mmtk/build.rs
index ee4d219f..2f2a2342 100644
--- a/mmtk/build.rs
+++ b/mmtk/build.rs
@@ -36,10 +36,6 @@ fn main() {
     // skip this process if that path already exists since
     // the .h files could have already beeen generated when building via Makefile
     if !Path::new(format!("{}/usr/include", buildroot_dir).as_str()).exists() {
-        println!(
-            "WARNING: running make inside {}/deps to generate the necessary .h files!",
-            julia_dir
-        );
         std::process::Command::new("make")
             .current_dir(format!("{}/deps", julia_dir))
             .env("BUILDDIR", buildroot_dir.clone())