Skip to content

Commit 56e6c7f

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

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

Makefile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,20 @@ endif
282282
endif
283283

284284
ifneq (${MMTK_PLAN},None)
285-
JL_PRIVATE_LIBS-0 += libmmtk_julia
285+
# Make sure we use the right version of $MMTK_PLAN, $MMTK_MOVING and $MMTK_BUILD
286+
ifeq (${MMTK_PLAN},Immix)
287+
LIB_PATH_PLAN = immix
288+
else ifeq (${MMTK_PLAN},StickyImmix)
289+
LIB_PATH_PLAN = sticky
290+
endif
291+
292+
ifeq ($(MMTK_MOVING), 0)
293+
LIB_PATH_MOVING := non_moving
294+
else
295+
LIB_PATH_MOVING := moving
296+
endif
297+
298+
JL_PRIVATE_LIBS-0 += $(LIB_PATH_PLAN)/$(LIB_PATH_MOVING)/$(MMTK_BUILD)/libmmtk_julia
286299
endif
287300

288301
# Note that we disable MSYS2's path munging here, as otherwise

0 commit comments

Comments
 (0)