Skip to content

Commit fb024c6

Browse files
authored
Copy libmmtk_julia to usr/lib (#15)
Copies libmmtk_julia.so from the source directory (`mmtk-julia/mmtk/target/debug/libmmtk_julia.so`) to `build/usr/lib`.
1 parent 0eeb64b commit fb024c6

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Make.inc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,14 @@ endif
750750
MMTK_DIR = ${MMTK_JULIA_DIR}/mmtk
751751
MMTK_API_INC = $(MMTK_DIR)/api
752752
MMTK_JULIA_INC = ${MMTK_JULIA_DIR}/julia
753-
MMTK_LIB := -L$(MMTK_DIR)/target/$(MMTK_BUILD) -lmmtk_julia
753+
ifeq ($(OS),Linux)
754+
MMTK_LIB_NAME := libmmtk_julia.so
755+
else
756+
$(error "Unsupported OS for MMTk")
757+
endif
758+
MMTK_LIB_SRC := $(MMTK_DIR)/target/$(MMTK_BUILD)/$(MMTK_LIB_NAME)
759+
MMTK_LIB_DST := $(BUILDROOT)/usr/lib/$(MMTK_LIB_NAME)
760+
MMTK_LIB := -lmmtk_julia
754761
LDFLAGS += -Wl,-rpath=$(MMTK_DIR)/target/$(MMTK_BUILD)/
755762
else
756763
MMTK_JULIA_INC :=
@@ -1692,6 +1699,9 @@ PRINT_PERL = printf ' %b %b\n' $(PERLCOLOR)PERL$(ENDCOLOR) $(BINCOLOR)$(GOAL)
16921699
PRINT_FLISP = printf ' %b %b\n' $(FLISPCOLOR)FLISP$(ENDCOLOR) $(BINCOLOR)$(GOAL)$(ENDCOLOR); $(1)
16931700
PRINT_JULIA = printf ' %b %b\n' $(JULIACOLOR)JULIA$(ENDCOLOR) $(BINCOLOR)$(GOAL)$(ENDCOLOR); $(1)
16941701
PRINT_DTRACE = printf ' %b %b\n' $(DTRACECOLOR)DTRACE$(ENDCOLOR) $(BINCOLOR)$(GOAL)$(ENDCOLOR); $(1)
1702+
ifeq ($(WITH_MMTK), 1)
1703+
PRINT_MMTK = printf ' %b %b\n' $(LINKCOLOR)MMTK$(ENDCOLOR) $(BINCOLOR)$(GOAL)$(ENDCOLOR); $(1)
1704+
endif
16951705

16961706
else
16971707
QUIET_MAKE =
@@ -1702,6 +1712,9 @@ PRINT_PERL = echo '$(subst ','\'',$(1))'; $(1)
17021712
PRINT_FLISP = echo '$(subst ','\'',$(1))'; $(1)
17031713
PRINT_JULIA = echo '$(subst ','\'',$(1))'; $(1)
17041714
PRINT_DTRACE = echo '$(subst ','\'',$(1))'; $(1)
1715+
ifeq ($(WITH_MMTK), 1)
1716+
PRINT_MMTK = echo '$(subst ','\'',$(1))'; $(1)
1717+
endif
17051718

17061719
endif
17071720

src/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ DOBJS := $(SRCS:%=$(BUILDDIR)/%.dbg.obj)
175175

176176
ifeq ($(WITH_MMTK), 1)
177177
MMTK_SRCS := mmtk_julia
178-
MMTK_OBJS := $(MMTK_SRCS:%=$(MMTK_JULIA_INC)/%.o)
178+
MMTK_OBJS := $(MMTK_SRCS:%=$(MMTK_JULIA_INC)/%.o) $(MMTK_LIB_DST)
179179
MMTK_DOBJS := $(MMTK_SRCS:%=$(MMTK_JULIA_INC)/%.dbg.obj)
180180
else
181181
MMTK_OBJS :=
@@ -254,6 +254,8 @@ $(MMTK_JULIA_INC)/%.o: $(MMTK_JULIA_INC)/%.c $(HEADERS) | $(MMTK_JULIA_INC)
254254
@$(call PRINT_CC, $(CC) $(JCPPFLAGS) $(JCFLAGS) $(SHIPFLAGS) $(DISABLE_ASSERTIONS) -c $< -o $@)
255255
$(MMTK_JULIA_INC)/%.dbg.obj: $(MMTK_JULIA_INC)/%.c $(HEADERS) | $(MMTK_JULIA_INC)
256256
@$(call PRINT_CC, $(CC) $(JCPPFLAGS) $(JCFLAGS) $(DEBUGFLAGS) -c $< -o $@)
257+
$(MMTK_LIB_DST): $(MMTK_LIB_SRC)
258+
@$(call PRINT_MMTK, cp $< $@)
257259
endif
258260

259261
# public header rules

0 commit comments

Comments
 (0)