Skip to content

Commit 3ba504a

Browse files
authored
Fix getall failure with MMTk dependency (#57038)
This PR fixes #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.
1 parent 9b1ea1a commit 3ba504a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

deps/mmtk_julia.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
MMTK_MOVING := 0
77
MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
88

9+
$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
10+
get-mmtk_julia: $(MMTK_JULIA_SRC_FILE)
11+
912
# Download the binding, build it from source
1013
ifeq (${MMTK_JULIA_DIR},$(BUILDROOT)/usr/lib/mmtk_julia)
11-
$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
1214

1315
MMTK_JULIA_DIR=$(BUILDROOT)/deps/$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)
1416
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
2426
$(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted
2527
@$(PROJECT_DIRS) $(MMTK_VARS) $(MAKE) -C $(MMTK_JULIA_DIR) $(MMTK_BUILD)
2628

27-
get-mmtk_julia: $(MMTK_JULIA_SRC_FILE)
2829
extract-mmtk_julia: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted
2930
configure-mmtk_julia: extract-mmtk_julia
3031
compile-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so

0 commit comments

Comments
 (0)