mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 16:38:01 +00:00
b819bd52c3Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39668/commits/2661bca950030bcfd36c7fc10f99224c85c6366a Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
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)
|
|
|