forked from java-native-access/jna
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix build failure using the suggestion on java-native-access#173
- Loading branch information
Stefan Saasen
committed
Apr 2, 2013
1 parent
9106422
commit 5ed7fa2
Showing
1 changed file
with
3 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -118,7 +118,7 @@ NDK_PLATFORM?=/Developer/Applications/android-ndk-r7c/platforms/android-14 | |
JAVA_INCLUDES= | ||
CINCLUDES+=-I"$(NDK_PLATFORM)/arch-arm/usr/include" # -I/usr/include | ||
LIBS=-nostdlib -L"$(NDK_PLATFORM)/arch-arm/usr/lib/" -lgcc -lc -ldl -lm | ||
LDFLAGS+=-Wl,-shared,-Bsymbolic | ||
LDFLAGS+=-Wl,-shared,-Bsymbolic,-no_pie,-no_compact_unwind | ||
This comment has been minimized.
Sorry, something went wrong. |
||
FFI_ENV=CPP="$(CPP)" CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG) $(CINCLUDES)" CPPFLAGS="$(CDEFINES) $(CINCLUDES)" LIBS="$(LIBS)" RANLIB="$(RANLIB)" | ||
FFI_CONFIG=--enable-static --disable-shared --with-pic=yes --host=arm-linux-eabi | ||
endif | ||
|
@@ -308,6 +308,8 @@ LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ | |
-compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ | ||
-current_version $(JNA_JNI_VERSION) \ | ||
-mmacosx-version-min=10.3 \ | ||
-framework Foundation \ | ||
-Wl,-no_compact_unwind,-no_pie \ | ||
This comment has been minimized.
Sorry, something went wrong.
twall
|
||
-install_name ${@F} \ | ||
$(SYSLIBROOT) | ||
# JAWT linkage handled by -framework JavaVM | ||
|
This line applies to android-arm, not macosx.