[jffi-next] 44/49: Re-enable fat (ppc, i386, x86_64) builds when Xcode 3 is installed in /Xcode3

[Tim Potter]

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

tpot-guest pushed a commit to annotated tag upstream/1.0.10
in repository jffi-next.

commit b459bd7ad36714bb80d9f85c46d55dfb1f70b67a
Author: Wayne Meissner <wmeissner at gmail.com>
Date:   Sun May 29 22:42:54 2011 +1000

    Re-enable fat (ppc, i386, x86_64) builds when Xcode 3 is installed in /Xcode3
---
 jni/GNUmakefile     | 11 ++++++++---
 libtest/GNUmakefile | 12 ++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/jni/GNUmakefile b/jni/GNUmakefile
index a7fd2fe..4c67b16 100755
--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
@@ -145,10 +145,15 @@ ifeq ($(OS), darwin)
   ifneq ($(findstring $(CPU), i386 x86_64),)
     ARCHES += i386 x86_64
   endif
-  CC = gcc
+  ifneq ($(realpath $(wildcard /Xcode3/usr/bin/gcc)),)
+    CC = /Xcode3/usr/bin/gcc-4.0
+  else
+    CC = gcc
+  endif
 
-  ifneq ($(realpath /Developer/SDKs/MacOSX10.4u.sdk),)
+  ifneq ($(realpath $(wildcard /Developer/SDKs/MacOSX10.4?.sdk)),)
     MACSDK = /Developer/SDKs/MacOSX10.4u.sdk
+    ARCHES += ppc
   else
     MACSDK = $(firstword $(strip $(wildcard /Developer/SDKs/MacOSX10.*.sdk)))
   endif
@@ -159,7 +164,7 @@ ifeq ($(OS), darwin)
 	-Wl,-syslibroot,$(MACSDK) -mmacosx-version-min=10.4
   JNIEXT = jnilib
   #CFLAGS += -I$(MACSDK)/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
-  FFI_CFLAGS += -isysroot $(MACSDK)
+  FFI_CFLAGS += -isysroot $(MACSDK) -I$(MACSDK)/usr/include
   PICFLAGS =
   SOFLAGS =
 endif
diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile
index a74331c..6a9c981 100644
--- a/libtest/GNUmakefile
+++ b/libtest/GNUmakefile
@@ -81,15 +81,23 @@ ifeq ($(OS), darwin)
   ifneq ($(findstring $(CPU), i386 x86_64),)
     ARCHES += i386 x86_64
   endif
-  CC = gcc
-  ifneq ($(realpath /Developer/SDKs/MacOSX10.4u.sdk),)
+  ifneq ($(realpath $(wildcard /Xcode3/usr/bin/gcc)),)
+    CC = /Xcode3/usr/bin/gcc-4.0
+  else
+    CC = gcc
+  endif
+
+  ifneq ($(realpath $(wildcard /Developer/SDKs/MacOSX10.4?.sdk)),)
     MACSDK = /Developer/SDKs/MacOSX10.4u.sdk
+    ARCHES += ppc
   else
     MACSDK = $(firstword $(strip $(wildcard /Developer/SDKs/MacOSX10.*.sdk)))
   endif
   CFLAGS += $(ARCHFLAGS) -isysroot $(MACSDK) -DTARGET_RT_MAC_CFM=0
   CFLAGS += -fno-common
+  CFLAGS += $(foreach arch, $(ARCHES),-arch $(arch))
   LDFLAGS = $(ARCHFLAGS) -dynamiclib -Wl,-syslibroot,$(MACSDK) -mmacosx-version-min=10.4
+  LDFLAGS += $(foreach arch, $(ARCHES),-arch $(arch))
   # link against the universal libraries on ppc machines
   LDFLAGS += -L$(MACSDK)/usr/lib
   LIBEXT = dylib

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