11# # MMTK ##
22
3- # FIXME: we only support non-moving at the moment
3+ # Both MMTK_MOVING and MMTK_PLAN should be specified in the Make.user file.
4+ # At this point, since we only support non-moving this is always set to 0
5+ # FIXME: change it to `?:` when introducing moving plans
46MMTK_MOVING := 0
57MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN ) MMTK_MOVING=$(MMTK_MOVING )
68
@@ -10,7 +12,7 @@ $(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
1012
1113MMTK_JULIA_DIR =$(BUILDDIR ) /$(MMTK_JULIA_SRC_DIR )
1214MMTK_JULIA_LIB_PATH =$(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD )
13- PROJECT_DIRS := JULIA_PATH=$(BUILDROOT ) MMTK_JULIA_DIR=$(SRCDIR ) /$(MMTK_JULIA_DIR )
15+ PROJECT_DIRS := JULIA_PATH=$(JULIAHOME ) JULIA_BUILDROOT= $( BUILDROOT ) MMTK_JULIA_DIR=$(SRCDIR ) /$(MMTK_JULIA_DIR )
1416
1517$(MMTK_JULIA_DIR ) /build-compiled : $(BUILDROOT ) /usr/lib/libmmtk_julia.so
1618 @echo 1 > $@
@@ -19,7 +21,7 @@ $(MMTK_JULIA_DIR)/build-compiled: $(BUILDROOT)/usr/lib/libmmtk_julia.so
1921$(BUILDROOT ) /usr/lib/libmmtk_julia.so : $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so
2022 @ln -sf $(SRCDIR ) /$(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so $@
2123
22- $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so : $(MMTK_JULIA_DIR ) /source-extracted
24+ $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so : $(MMTK_JULIA_DIR ) /source-extracted
2325 @$(PROJECT_DIRS ) $(MMTK_VARS ) $(MAKE ) -C $(MMTK_JULIA_DIR ) $(MMTK_BUILD )
2426
2527get-mmtk_julia : $(MMTK_JULIA_SRC_FILE )
@@ -35,7 +37,7 @@ $(eval $(call symlink_install,mmtk_julia,$$(MMTK_JULIA_SRC_DIR),$$(BUILDROOT)/us
3537# Build it and symlink libmmtk_julia.so file into $(BUILDROOT)/usr/lib
3638else
3739
38- PROJECT_DIRS := JULIA_PATH=$(BUILDROOT ) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR )
40+ PROJECT_DIRS := JULIA_PATH=$(JULIAHOME ) JULIA_BUILDROOT= $( BUILDROOT ) MMTK_JULIA_DIR=$( SRCDIR ) / $(MMTK_JULIA_DIR )
3941MMTK_JULIA_LIB_PATH =$(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD )
4042
4143install-mmtk_julia : compile-mmtk_julia $(build_prefix ) /manifest/mmtk_julia
@@ -45,7 +47,7 @@ compile-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
4547version-check-mmtk_julia : $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so
4648
4749# NB: This will NOT run `cargo build` if there are changes in the Rust source files
48- # inside the binding repo. However the target below should remake the symlink if there
50+ # inside the binding repo. However the target below should remake the symlink if there
4951# are changes in the libmmtk_julia.so from the custom MMTK_JULIA_DIR folder
5052$(BUILDROOT ) /usr/lib/libmmtk_julia.so : $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so
5153 @ln -sf $(MMTK_JULIA_DIR ) /mmtk/target/$(MMTK_BUILD ) /libmmtk_julia.so $@
0 commit comments