You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
925 B
26 lines
925 B
--- a/native/Makefile 2016-03-16 14:37:28.000000000 +0000
|
|
+++ b/native/Makefile 2016-04-16 22:27:06.426345376 +0100
|
|
@@ -81,7 +81,7 @@
|
|
LIBSFX=.so
|
|
ARSFX=.a
|
|
JNISFX=$(LIBSFX)
|
|
-CC=gcc
|
|
+CC?=gcc
|
|
LD=$(CC)
|
|
LIBS=
|
|
# Default to Sun recommendations for JNI compilation
|
|
@@ -94,10 +94,10 @@
|
|
COUT=-o $@
|
|
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
|
|
CDEFINES=-D_REENTRANT
|
|
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
|
|
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
|
+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
|
|
+CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
|
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
|
|
-LDFLAGS=-o $@ -shared
|
|
+LDFLAGS+= -o $@ -shared
|
|
ifeq ($(DYNAMIC_LIBFFI),true)
|
|
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
|
|
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
|