diff --git a/dkpsp/scripts/build-gcc.sh b/dkpsp/scripts/build-gcc.sh
index 894609f..50c501c 100644
--- a/dkpsp/scripts/build-gcc.sh
+++ b/dkpsp/scripts/build-gcc.sh
@@ -5,11 +5,12 @@ prefix=$INSTALLDIR/devkitPSP
 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
 
@@ -22,7 +23,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 --disable-shared --disable-debug \
 	--disable-threads --with-gcc --with-gnu-as --with-gnu-ld --with-stabs \
 	|| { echo "Error configuring binutils"; exit 1; }
@@ -52,8 +53,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 \
 	--disable-multilib\
 	--with-gcc --with-gnu-ld --with-gnu-as\
 	--disable-shared --disable-win32-registry --disable-nls\
@@ -190,18 +191,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