[jffi-next] 06/22: Pull in some aix and win32 cross compilation fixes

[Tim Potter]

This is an automated email from the git hooks/post-receive script.

tpot-guest pushed a commit to tag 0.6.0.1
in repository jffi-next.

commit 1e839fa72d24e66aa854ab19dca1e51f4bb29ecc
Author: Wayne Meissner <wmeissner at gmail.com>
Date:   Thu Sep 24 09:17:45 2009 +1000

    Pull in some aix and win32 cross compilation fixes
---
 custom-build.xml | 4 ++--
 jni/GNUmakefile  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom-build.xml b/custom-build.xml
index 2759cca..b53ae8a 100644
--- a/custom-build.xml
+++ b/custom-build.xml
@@ -136,7 +136,7 @@
             <arg value="SRC_DIR=${jni.src.dir}"/>
             <arg value="JNI_DIR=${jni.src.dir}"/>
             <arg value="BUILD_DIR=${jni.build.dir}"/>
-            <arg value="CPU=${os.arch}"/>
+            <arg value="CPU=${platform.cpu}"/>
             <arg value="VERSION=${jffi.version.major}.${jffi.version.minor}"/>
             <arg value="-f"/>
             <arg value="${jni.GNUmakefile}"/>
@@ -154,7 +154,7 @@
             <arg value="JNI_DIR=${src.native.dir}"/>
             <arg value="BUILD_DIR=${build.native.dir}"/>
             <arg value="VERSION=${jffi.version.major}.${jffi.version.minor}"/>
-            <arg value="CPU=${os.arch}"/>
+            <arg value="CPU=i386"/>
             <arg value="-f"/>
             <arg value="jni/GNUmakefile"/>
         </exec>
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
index 587afe4..653e5f9 100755
--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
@@ -113,6 +113,7 @@ ifeq ($(OS), aix)
   CFLAGS += -pthread
   LDFLAGS += -pthread
   JNIEXT = a
+  STRIP = strip
 endif
 
 ifneq ($(findstring bsd, $(OS)),)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-next.git