blob: 67e528cd15bea07aa5811b4fbf7d7380165261a2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
index 8ac84a6..3ac3091 100755
--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
@@ -66,9 +66,11 @@ OFLAGS = -O2 $(JFLAGS)
WERROR = -Werror
ifneq ($(OS),darwin)
ifneq ($(OS),aix)
+ifneq ($(OS),linux)
WFLAGS += -Wundef $(WERROR)
endif
endif
+endif
WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
PICFLAGS = -fPIC
SOFLAGS = # Filled in for each OS specifically
@@ -263,7 +265,7 @@ debug:
@echo "OBJS=$(OBJS)"
$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(LIBFFI_LIBS)
$(STRIP) $@
ifeq ($(OS), darwin)
codesign -s - $@
@@ -272,10 +274,14 @@ endif
$(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
@mkdir -p $(@D)
@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
+ mkdir -p $(@D)
+ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
$(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
@mkdir -p $(@D)
@$(CC) $(CFLAGS) -o $@ -c $<
+ mkdir -p $(@D)
+ $(CC) $(CFLAGS) -o $@ -c $<
$(OBJS) : $(LIBFFI_LIBS)
|
