From 6e800640c894ac75f9091b5c4a9b4fe68632b29c Mon Sep 17 00:00:00 2001
From: Dave Murphy <wntrmute@users.sourceforge.net>
Date: Thu, 30 Apr 2009 17:44:07 +0000
Subject: [PATCH] rework scripts for OSX universal

---
 dkarm-eabi/scripts/build-gcc.sh | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh
index 942aa0f..e81467a 100644
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/dkarm-eabi/scripts/build-gcc.sh
@@ -8,11 +8,12 @@ prefix=$INSTALLDIR/devkitARM
 PLATFORM=`uname -s`
 
 case $PLATFORM in
-  Darwin )
-    CONFIG_EXTRA=env CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" LDFLAGS="-arch i386 -arch ppc"
+  Darwin )	
+    cflags="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+	ldflags="-arch i386 -arch ppc"
     ;;
   MINGW32* )
-    CONFIG_EXTRA=env CFLAGS="-D__USE_MINGW_ACCESS"
+    cflags="-D__USE_MINGW_ACCESS"
     ;;
 esac
 
@@ -25,7 +26,7 @@ cd $target/binutils
 
 if [ ! -f configured-binutils ]
 then
-  $CONFIG_EXTRA ../../$BINUTILS_SRCDIR/configure \
+  CFLAGS=$cflags LDFLAGS=$ldflags ../../$BINUTILS_SRCDIR/configure \
         --prefix=$prefix --target=$target --disable-nls \
         || { echo "Error configuring binutils"; exit 1; }
   touch configured-binutils
@@ -53,8 +54,8 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-  $CONFIG_EXTRA ../../$GCC_SRCDIR/configure \
-        --enable-languages=c,c++ \
+  CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../$GCC_SRCDIR/configure \
+        --enable-languages=c,c++,objc \
         --with-cpu=arm7tdmi\
         --enable-interwork --enable-multilib\
         --with-gcc --with-gnu-ld --with-gnu-as \
@@ -64,7 +65,7 @@ then
         --target=$target \
         --with-newlib \
         --prefix=$prefix\
-        --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 25" \
+        --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 26" \
         || { echo "Error configuring gcc"; exit 1; }
   touch configured-gcc
 fi
@@ -81,6 +82,7 @@ then
   touch installed-gcc
 fi
 
+unset CFLAGS
 cd $BUILDSCRIPTDIR
 
 #---------------------------------------------------------------------------------
@@ -144,18 +146,9 @@ PLATFORM=`uname -s`
 
 if [ ! -f configured-gdb ]
 then
-  case $PLATFORM in
-    Darwin )
-      env CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" LDFLAGS="-arch i386 -arch ppc" ../../$GDB_SRCDIR/configure \
-      --disable-nls --prefix=$prefix --target=$target --disable-werror \
-      || { echo "Error configuring gdb"; exit 1; }
-    ;;
-    * )
-      ../../$GDB_SRCDIR/configure \
-      --disable-nls --prefix=$prefix --target=$target --disable-werror \
-      || { echo "Error configuring gdb"; exit 1; }
-    ;;
-esac
+  CFLAGS="$cflags" LDFLAGS="$ldflags" ../../$GDB_SRCDIR/configure \
+  --disable-nls --prefix=$prefix --target=$target --disable-werror \
+  || { echo "Error configuring gdb"; exit 1; }
   touch configured-gdb
 fi