Skip to content

Commit 1dd6ae8

Browse files
committed
Install the right version of libmmtk_julia
1 parent 6307dab commit 1dd6ae8

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,26 @@ endif
282282
endif
283283

284284
ifneq (${MMTK_PLAN},None)
285+
# Make sure we use the right version of $MMTK_PLAN, $MMTK_MOVING and $MMTK_BUILD
286+
# if we use the BinaryBuilder version of mmtk-julia
287+
ifeq ($(USE_BINARYBUILDER_MMTK_JULIA),1)
288+
ifeq (${MMTK_PLAN},Immix)
289+
LIB_PATH_PLAN = immix
290+
else ifeq (${MMTK_PLAN},StickyImmix)
291+
LIB_PATH_PLAN = sticky
292+
endif
293+
294+
ifeq ($(MMTK_MOVING), 0)
295+
LIB_PATH_MOVING := non_moving
296+
else
297+
LIB_PATH_MOVING := moving
298+
endif
299+
300+
JL_PRIVATE_LIBS-0 += $(LIB_PATH_PLAN)/$(LIB_PATH_MOVING)/$(MMTK_BUILD)/libmmtk_julia
301+
else
285302
JL_PRIVATE_LIBS-0 += libmmtk_julia
286303
endif
304+
endif
287305

288306
# Note that we disable MSYS2's path munging here, as otherwise
289307
# it replaces our `:`-separated list as a `;`-separated one.

0 commit comments

Comments
 (0)