From 3ba504a5484c48720aa3f19e7ef51a5a32c3a7db Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 15 Jan 2025 00:39:11 +1300 Subject: [PATCH] Fix getall failure with MMTk dependency (#57038) This PR fixes https://github.com/JuliaLang/julia/issues/57002. The current makefile checks if `MMTK_JULIA_DIR` points to `$(BUILDROOT)/usr/lib/mmtk_julia` and defines the rule `get-mmtk_julia` if the condition is met. For non-mmtk builds (e.g. `make -C deps getall`), `MMTK_JULIA_DIR` is not defined, thus `get-mmtk_julia` is not defined. This PR moves the rule `get-mmtk_julia` outside the condition so it always exists. --- deps/mmtk_julia.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/mmtk_julia.mk b/deps/mmtk_julia.mk index ccf638e9211bb..7ec55426821c3 100644 --- a/deps/mmtk_julia.mk +++ b/deps/mmtk_julia.mk @@ -6,9 +6,11 @@ MMTK_MOVING := 0 MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING) +$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR))) +get-mmtk_julia: $(MMTK_JULIA_SRC_FILE) + # Download the binding, build it from source ifeq (${MMTK_JULIA_DIR},$(BUILDROOT)/usr/lib/mmtk_julia) -$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR))) MMTK_JULIA_DIR=$(BUILDROOT)/deps/$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR) MMTK_JULIA_LIB_PATH=$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD) @@ -24,7 +26,6 @@ $(BUILDROOT)/usr/lib/libmmtk_julia.so: $(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so $(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted @$(PROJECT_DIRS) $(MMTK_VARS) $(MAKE) -C $(MMTK_JULIA_DIR) $(MMTK_BUILD) -get-mmtk_julia: $(MMTK_JULIA_SRC_FILE) extract-mmtk_julia: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted configure-mmtk_julia: extract-mmtk_julia compile-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so