From: Torsten Werner Date: Thu, 5 Aug 2010 04:28:08 +0200 Subject: [PATCH] do not add -m32 or -m64 to CC and LD --- jni/GNUmakefile | 4 ++-- libtest/GNUmakefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/GNUmakefile b/jni/GNUmakefile index 87d1ef1..166ff8a 100755 --- a/jni/GNUmakefile +++ b/jni/GNUmakefile @@ -198,8 +198,8 @@ endif ifneq ($(strip $(findstring $(OS), linux solaris)),) # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) + #CC += -m$(MODEL) + #LD += -m$(MODEL) endif LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT) diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile index 298a612..bd2928a 100644 --- a/libtest/GNUmakefile +++ b/libtest/GNUmakefile @@ -149,8 +149,8 @@ endif ifneq ($(strip $(findstring $(OS), linux solaris)),) # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) + #CC += -m$(MODEL) + #LD += -m$(MODEL) endif LIBTEST = $(BUILD_DIR)/$(LIBNAME) --