Skip to content

Commit

Permalink
fix: fix build error with BUILD_REMOTE and BUILD_JNI enabled
Browse files Browse the repository at this point in the history
The JNI related object file is included in the remote worker related object files
if the build options BUILD_REMOTE and BUILD_JNI are enabled.
This should not happen and it causes the building error.
The commit make sure the un-related object files would not be included.

Close #166.
  • Loading branch information
marktwtn committed Jun 28, 2019
1 parent 695b7eb commit d99addb
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ OBJS += \
remote_common.o \
remote_interface.o

WORKER_OBJS := $(addprefix $(OUT)/worker-,$(filter-out remote_interface.o, $(OBJS)))
WORKER_EXCLUDE_OBJS := remote_interface.o
ifeq ("$(BUILD_JNI)", "1")
WORKER_EXCLUDE_OBJS += jni/iri-pearldiver-exlib.o
endif
WORKER_OBJS := $(addprefix $(OUT)/worker-,$(filter-out $(WORKER_EXCLUDE_OBJS), $(OBJS)))
WORKER_CFLAGS := $(filter-out -DENABLE_REMOTE, $(CFLAGS))
endif

Expand Down

0 comments on commit d99addb

Please sign in to comment.