Skip to content

Commit 8ad290b

Browse files
committed
YJIT: Fix BSD make build. Remove ZJIT stuff
Thanks to nobu for pointing this out. This is a YJIT file so shouldn't have ZJIT stuff in it. ZJIT doesn't support building on BSDs yet. Fix: 92b218f
1 parent 5076e88 commit 8ad290b

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

yjit/not_gmake.mk

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,7 @@ yjit-static-lib:
1212
$(Q) $(RUSTC) $(YJIT_RUSTC_ARGS)
1313

1414
# Assume GNU flavor LD and OBJCOPY. Works on FreeBSD 13, at least.
15-
$(YJIT_LIBOBJ): $(YJIT_LIBS)
15+
$(RUST_LIBOBJ): $(YJIT_LIBS)
1616
$(ECHO) 'partial linking $(YJIT_LIBS) into $@'
1717
$(Q) $(LD) -r -o $@ --whole-archive $(YJIT_LIBS)
1818
-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)
19-
20-
.PHONY: zjit-static-lib
21-
$(ZJIT_LIBS): zjit-static-lib
22-
$(empty)
23-
24-
zjit-static-lib:
25-
$(ECHO) 'building Rust ZJIT (release mode)'
26-
$(Q) $(RUSTC) $(ZJIT_RUSTC_ARGS)
27-
28-
# Assume GNU flavor LD and OBJCOPY. Works on FreeBSD 13, at least.
29-
$(ZJIT_LIBOBJ): $(ZJIT_LIBS)
30-
$(ECHO) 'partial linking $(ZJIT_LIBS) into $@'
31-
$(Q) $(LD) -r -o $@ --whole-archive $(ZJIT_LIBS)
32-
-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)

0 commit comments

Comments
 (0)