Skip to content

Commit 0a97e82

Browse files
authored
Removing WITH_MMTK (#202)
Merge with mmtk/julia#79.
1 parent 18c519d commit 0a97e82

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/scripts/Make.user

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
WITH_MMTK=1
21
FORCE_ASSERTIONS=1
32
LLVM_ASSERTIONS=1

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
```
66
git clone https://github.com/mmtk/mmtk-julia
77
git clone https://github.com/mmtk/julia
8-
(cd julia && git checkout dev && echo 'WITH_MMTK=1' > Make.user)
8+
(cd julia && git checkout dev && echo 'MMTK_PLAN=Immix' > Make.user) # or MMTK_PLAN=StickyImmix to use Sticky Immix
99
export JULIA_PATH=`pwd`/julia
1010
export MMTK_JULIA_DIR=`pwd`/mmtk-julia
1111
(cd mmtk-julia/mmtk && cargo build --features immix --release) # or drop "--release" for a debug build
12-
MMTK_PLAN=Immix MMTK_BUILD=release MMTK_JULIA_DIR=`pwd`/mmtk-julia make -C julia # or "MMTK_BUILD=debug"
12+
MMTK_BUILD=release MMTK_JULIA_DIR=`pwd`/mmtk-julia make -C julia # or "MMTK_BUILD=debug"
1313
```
1414

1515
If you would like debugging information in your release build of MMTk, add `debug = true` under `[profile.release]` in `mmtk/Cargo.toml`.
@@ -45,7 +45,7 @@ For a release build with debugging information, first add `debug = true` under `
4545

4646
To build Julia with MMTk, first ensure you have the prerequisites for building both [Julia](https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries) and [MMTk](https://github.com/mmtk/mmtk-core#requirements).
4747

48-
Next create a `Make.user` file in the top-level directory of the Julia repository consisting of the line `WITH_MMTK=1`.
48+
Next create a `Make.user` file in the top-level directory of the Julia repository consisting of the line `MMTK_PLAN=Immix` or `MMTK_PLAN=StickyImmix`.
4949

5050
Finally, set the following environment variables:
5151

@@ -60,7 +60,7 @@ Alternatively you can set the environment variables in your `Make.user`
6060
```
6161
export MMTK_BUILD := release
6262
export MMTK_JULIA_DIR := <path-to-mmtk-julia>
63-
export MMTK_PLAN := Immix
63+
export MMTK_PLAN := Immix # or export MMTK_PLAN := StickyImmix
6464
```
6565

6666
### Heap Size

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2018"
1111
[package.metadata.julia]
1212
# 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.
1313
julia_repo = "https://github.com/mmtk/julia.git"
14-
julia_version = "e02662335575ef1dc486631ef348dc3c76787d46"
14+
julia_version = "32d38fb974b955bc2c610a72617cfc59265fa260"
1515

1616
[lib]
1717
crate-type = ["cdylib"]

0 commit comments

Comments
 (0)