Skip to content

Commit

Permalink
Fix native artifact linking, fixes #128
Browse files Browse the repository at this point in the history
This fixes linking of the native library to ffi, at least where we build
against the system library.

The issue seems to have been introduced in
3a5a677
  • Loading branch information
jcharaoui committed Dec 9, 2022
1 parent 37aa891 commit c404bcb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions jni/GNUmakefile
Expand Up @@ -278,7 +278,7 @@ debug:
@echo "OBJS=$(OBJS)"

$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
$(STRIP) $@
ifeq ($(OS), darwin)
codesign -s - $@
Expand All @@ -292,7 +292,7 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
@mkdir -p $(@D)
@$(CC) $(CFLAGS) -o $@ -c $<

$(OBJS) : $(LIBFFI)
$(OBJS) : $(LIBFFI_LIBS)

ifeq ($(OS), darwin)
build_ffi = \
Expand Down

0 comments on commit c404bcb

Please sign in to comment.