Skip to content

Commit fa683fe

Browse files
committed
Updating julia hash commit
1 parent 67f3f87 commit fa683fe

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f25a37b9b330dc5b5556d151ba690096
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1302c9e81ad322282428e6ab76b1320b41c2b2172982f9a0797438dbfb14501b257cd8fd0e9024906b41102da7404379e534fe5160f737d1d01a378726413ad

deps/checksums/mmtk_julia-dd0478b83ba18215efeaf90c67479b60102d5166.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/mmtk_julia-dd0478b83ba18215efeaf90c67479b60102d5166.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/mmtk_julia.mk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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
46
MMTK_MOVING := 0
57
MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
68

@@ -10,7 +12,7 @@ $(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
1012

1113
MMTK_JULIA_DIR=$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)
1214
MMTK_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

2527
get-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
3638
else
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)
3941
MMTK_JULIA_LIB_PATH=$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)
4042

4143
install-mmtk_julia: compile-mmtk_julia $(build_prefix)/manifest/mmtk_julia
@@ -45,7 +47,7 @@ compile-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
4547
version-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 $@

deps/mmtk_julia.version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# FIXME: Update these with a proper version from mmtk/mmtk-julia before merging
22
MMTK_JULIA_BRANCH = release-0.29.0
3-
MMTK_JULIA_SHA1 = dd0478b83ba18215efeaf90c67479b60102d5166
3+
MMTK_JULIA_SHA1 = d0d69b28992e870ecd8239a1fd3261351628c83e
44
MMTK_JULIA_GIT_URL := https://github.com/udesou/mmtk-julia.git
5-
MMTK_JULIA_TAR_URL = https://github.com/udesou/mmtk-julia/archive/refs/tags/v0.0.1-test.tar.gz
5+
MMTK_JULIA_TAR_URL = https://github.com/udesou/mmtk-julia/archive/refs/tags/v0.1.0-test.tar.gz

0 commit comments

Comments
 (0)