iphone-toolchain patch for Mac OS X 64bit

iphone-toolchain.patch

Index: toolchain.sh
===================================================================
--- toolchain.sh	(revision 83)
+++ toolchain.sh	(working copy)
@@ -24,11 +24,13 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
 # What version of the toolchain are we building?
 TOOLCHAIN_VERSION="3.1.2"
 
 #what device are we building for?
-DEVICE="iPhone_3G"
+DEVICE="iPhone_3GS"
 
 # Everything is built relative to IPHONEDEV_DIR
 IPHONEDEV_DIR="`pwd`"
@@ -140,8 +142,8 @@
 # Compare two version strings and return a string indicating whether the first version number
 # is newer, older or equal to the second. This is quite dumb, but it works.
 vercmp() {
-	V1=`echo "$1" | sed -e 's/[^0-9]//g' | LANG=C awk '{ printf "%0.10f", "0."$0 }'`
-	V2=`echo "$2" | sed -e 's/[^0-9]//g' | LANG=C awk '{ printf "%0.10f", "0."$0 }'`
+	V1=`echo "$1" | sed -e 's/[^0-9]//g' | LANG=C gawk '{ printf "%0.10f", "0."$0 }'`
+	V2=`echo "$2" | sed -e 's/[^0-9]//g' | LANG=C gawk '{ printf "%0.10f", "0."$0 }'`
 	[[ $V1 > $V2 ]] && echo "newer"
 	[[ $V1 == $V2 ]] && echo "equal"
 	[[ $V1 < $V2 ]] && echo "older"
@@ -253,7 +255,7 @@
 	local PLIST_KEY="$1"
 	local PLIST_DATA="$3"
 
-	cat "${PLIST_DATA}" | awk '
+	cat "${PLIST_DATA}" | gawk '
 		/<key>.*<¥/key>/ { sub(/^.*<key>/, "", $0); sub(/<¥/key>.*$/, "", $0); lastKey = $0; }
 		/<dict>/ { path = path lastKey "/"; }
 		/<¥/dict>/ { sub(/[a-zA-Z0-9]*¥/$/, "", path);}
@@ -333,7 +335,7 @@
 	# Check the version of the SDK
 	# Apple seems to apply a policy of rounding off the last component of the long version number
 	# so we'll do the same here
-	SDK_VERSION=$(plist_key CFBundleShortVersionString "/" "${MNT_DIR}/iPhone SDK.mpkg/Contents/version.plist" | awk '
+	SDK_VERSION=$(plist_key CFBundleShortVersionString "/" "${MNT_DIR}/iPhone SDK.mpkg/Contents/version.plist" | gawk '
 		BEGIN { FS="." }
 		{
 			if(substr($4,1,1) >= 5)
@@ -373,7 +375,7 @@
 
 	rm -fR $TMP_DIR/*
 
-	cp ${MNT_DIR}/Packages/$PACKAGE $TMP_DIR/iphone.pkg
+	gcp ${MNT_DIR}/Packages/$PACKAGE $TMP_DIR/iphone.pkg
 	cd $TMP_DIR
 	xar -xf iphone.pkg Payload
 	# zcat on OSX needs .Z suffix
@@ -392,7 +394,7 @@
 
 	message_status "Extracting MacOSX10.5.pkg..."
 
-	cp ${MNT_DIR}/Packages/MacOSX10.5.pkg $TMP_DIR/macosx.pkg
+	gcp ${MNT_DIR}/Packages/MacOSX10.5.pkg $TMP_DIR/macosx.pkg
 	cd $TMP_DIR 
 	xar -xf macosx.pkg Payload
 	cat Payload | zcat | cpio -id
@@ -434,7 +436,7 @@
 		echo "I can't find the firmware image for iPhone/iPod Touch $TOOLCHAIN_VERSION."
 		if ! confirm -N "Do you have it?"; then
 			if confirm "Do you want me to download it?"; then
-				APPLE_DL_URL=$(cat ${HERE}/firmware.list | awk '$1 ~ /'"^${TOOLCHAIN_VERSION}$"'/ && $2 ~ /^iPhone¥(3G¥)$/ { print $3; }')
+				APPLE_DL_URL=$(cat ${HERE}/firmware.list | gawk '$1 ~ /'"^${TOOLCHAIN_VERSION}$"'/ && $2 ~ /^iPhone¥(3G¥)$/ { print $3; }')
 				FW_FILE=`basename "${APPLE_DL_URL}"`
 				if [ ! $APPLE_DL_URL ] ; then
 					error "Can't find a download url for the toolchain version and platform specified."
@@ -467,8 +469,8 @@
 	if [ "x$sha1cmd" != "x" ] ; then
 		ff=`basename ${FW_FILE}`
 		should=$(cat ${HERE}/firmware.list | ¥
-			awk '$1 ~ /'"^${TOOLCHAIN_VERSION}$"'/ && $3 ~ /'"${ff}"'/ { print $4; }')
-		sha1=$(sha1sum ${FW_FILE} | awk ' { print $1; exit; }')
+			gawk '$1 ~ /'"^${TOOLCHAIN_VERSION}$"'/ && $3 ~ /'"${ff}"'/ { print $4; }')
+		sha1=$(sha1sum ${FW_FILE} | gawk ' { print $1; exit; }')
 		if [ "x$should" != "x" -a "x$should" != "x" ] ; then
 			if [ "$sha1" == "$should" ] ; then 
 				cecho green "Checksum of firmware file is valid."
@@ -521,14 +523,14 @@
 		echo "We need the decryption key for `basename $FW_RESTORE_SYSTEMDISK`."
 		echo "I'm going to try to fetch it from $IPHONEWIKI_KEY_URL...."
  
-		IPHONEWIKI_KEY_URL=$( wget --quiet -O - $IPHONEWIKI_KEY_URL | awk '
+		IPHONEWIKI_KEY_URL=$( wget --quiet -O - $IPHONEWIKI_KEY_URL | gawk '
 		    BEGIN { IGNORECASE = 1; }
 	    	/name="'${DEVICE}'/  { found_phone=1; } 
 			/.*'${TOOLCHAIN_VERSION}'.*/ && found_phone { found_firmware=1; }
 	     	/.*href=.*/ && found_firmware { while(sub(/href=|"/,"", $3));; print $3; exit;}  
 		')
 		
-		DECRYPTION_KEY_SYSTEM=`wget --quiet -O - "http://www.theiphonewiki.com"$IPHONEWIKI_KEY_URL | awk '
+		DECRYPTION_KEY_SYSTEM=`wget --quiet -O - "http://www.theiphonewiki.com"$IPHONEWIKI_KEY_URL | gawk '
  		    BEGIN { IGNORECASE = 1; }
 			/.*VFDecrypt.*/  { print $3;}  
 		'`
@@ -547,7 +549,7 @@
 	message_status "Copying required components of the firmware..."
 
 	mkdir -p "${FW_VERSION_DIR}"
-	sudo cp -R -p * "${FW_VERSION_DIR}"
+	sudo gcp -R -p * "${FW_VERSION_DIR}"
 	sudo chown -R `id -u`:`id -g` $FW_VERSION_DIR
 	message_status "Unmounting..."
 
@@ -558,7 +560,7 @@
 		rm "${FW_DIR}/current"
 	fi
 
-	ln -s "${FW_VERSION_DIR}" "${FW_DIR}/current"
+	gln -s "${FW_VERSION_DIR}" "${FW_DIR}/current"
 	rm "${TMP_DIR}/$FW_RESTORE_SYSTEMDISK" "${TMP_DIR}/${FW_RESTORE_SYSTEMDISK}.decrypted" $FW_SYSTEM_DMG "${TMP_DIR}/Restore.plist"
 }
 
@@ -618,7 +620,7 @@
 		ARCHIVES=$(find ./* -name '*.tar.gz')
 		for a in $ARCHIVES; do
 			basename $a .tar.gz
-			tar --overwrite -xzof $a
+			gnutar --overwrite -xzof $a
 		done
 
 		# Permissions are being extracted along with the gzipped 
@@ -641,127 +643,127 @@
 			message_status "Copying required iPhone filesystem components..."
 			# I have tried to avoid copying the permissions (not using -a) because they
 			# get in the way later down the track. This might be wrong but it seems okay.
-			cp -R -p ${FW_DIR}/current/* "$SYS_DIR"
+			gcp -R -p ${FW_DIR}/current/* "$SYS_DIR"
 			rm -rf usr/include
 		fi
 	else
 		message_status "Copying required iPhone filesystem components..."
-		cp -R -p ${FW_DIR}/current/* "$SYS_DIR" # As above
+		gcp -R -p ${FW_DIR}/current/* "$SYS_DIR" # As above
 		rm -rf usr/include
 	fi
 
 	# Presently working here and below
 	message_status "Copying SDK headers..."
 	echo "Leopard"
-	cp -R -p "${LEOPARD_SDK_INC}" usr/include
+	gcp -R -p "${LEOPARD_SDK_INC}" usr/include
 	cd usr/include
-	ln -sf . System
+	gln -sf . System
 
-	cp -R -pf "${IPHONE_SDK_INC}"/* .
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/xnu-1228.7.58/osfmk/* .
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/xnu-1228.7.58/bsd/* . 
+	gcp -R -pf "${IPHONE_SDK_INC}"/* .
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/xnu-1228.7.58/osfmk/* .
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/xnu-1228.7.58/bsd/* . 
 
 	echo "mach"
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/cctools-*/include/mach .
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/cctools-*/include/mach-o .
-	cp -R -pf "${IPHONE_SDK_INC}"/mach-o/dyld.h mach-o
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/cctools-*/include/mach .
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/cctools-*/include/mach-o .
+	gcp -R -pf "${IPHONE_SDK_INC}"/mach-o/dyld.h mach-o
 
-	cp -R -pf "${LEOPARD_SDK_INC}"/mach/machine mach
-	cp -R -pf "${LEOPARD_SDK_INC}"/mach/machine.h mach
-	cp -R -pf "${LEOPARD_SDK_INC}"/machine .
-	cp -R -pf "${IPHONE_SDK_INC}"/machine .
+	gcp -R -pf "${LEOPARD_SDK_INC}"/mach/machine mach
+	gcp -R -pf "${LEOPARD_SDK_INC}"/mach/machine.h mach
+	gcp -R -pf "${LEOPARD_SDK_INC}"/machine .
+	gcp -R -pf "${IPHONE_SDK_INC}"/machine .
 
-	cp -R -pf "${IPHONE_SDK_INC}"/sys/cdefs.h sys
-	cp -R -pf "${LEOPARD_SDK_INC}"/sys/dtrace.h sys
+	gcp -R -pf "${IPHONE_SDK_INC}"/sys/cdefs.h sys
+	gcp -R -pf "${LEOPARD_SDK_INC}"/sys/dtrace.h sys
 
-	cp -R -pf "${LEOPARD_SDK_LIBS}"/Kernel.framework/Versions/A/Headers/machine/disklabel.h machine
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/configd-*/dnsinfo/dnsinfo.h .
-	cp -R -p "${DARWIN_SOURCES_DIR}"/Libc-*/include/kvm.h .
-	cp -R -p "${DARWIN_SOURCES_DIR}"/launchd-*/launchd/src/*.h .
+	gcp -R -pf "${LEOPARD_SDK_LIBS}"/Kernel.framework/Versions/A/Headers/machine/disklabel.h machine
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/configd-*/dnsinfo/dnsinfo.h .
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/Libc-*/include/kvm.h .
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/launchd-*/launchd/src/*.h .
 
-	cp -R -p i386/disklabel.h arm
-	cp -R -p mach/i386/machine_types.defs mach/arm
+	gcp -R -p i386/disklabel.h arm
+	gcp -R -p mach/i386/machine_types.defs mach/arm
 
 	mkdir -p Kernel
 	echo "libsa"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/xnu-1228.3.13/libsa/libsa Kernel
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/xnu-1228.3.13/libsa/libsa Kernel
 
 	mkdir -p Security
 	echo "libsecurity"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_authorization-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cdsa_client-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cdsa_utilities-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cms-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_codesigning-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cssm-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_keychain-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_mds-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_ssl-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_utilities-*/lib/*.h Security
-	cp -R -p "${DARWIN_SOURCES_DIR}"/libsecurityd-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_authorization-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cdsa_client-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cdsa_utilities-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cms-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_codesigning-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_cssm-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_keychain-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_mds-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_ssl-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurity_utilities-*/lib/*.h Security
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/libsecurityd-*/lib/*.h Security
 
 	mkdir -p DiskArbitration
 	echo "DiskArbitration"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/DiskArbitration-*/DiskArbitration/*.h DiskArbitration
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/DiskArbitration-*/DiskArbitration/*.h DiskArbitration
 
 	echo "iokit"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/xnu-*/iokit/IOKit .
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IOKitUser-*/*.h IOKit
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/xnu-*/iokit/IOKit .
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IOKitUser-*/*.h IOKit
 
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IOGraphics-*/IOGraphicsFamily/IOKit/graphics IOKit
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem IOKit
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IOGraphics-*/IOGraphicsFamily/IOKit/graphics IOKit
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem IOKit
 
 	for proj in kext ps pwr_mgt; do
 		mkdir -p IOKit/"${proj}"
-		cp -R -p "${DARWIN_SOURCES_DIR}"/IOKitUser-*/"${proj}".subproj/*.h IOKit/"${proj}"
+		gcp -R -p "${DARWIN_SOURCES_DIR}"/IOKitUser-*/"${proj}".subproj/*.h IOKit/"${proj}"
 	done
 
-	ln -s IOKit/kext/bootfiles.h .
+	gln -s IOKit/kext/bootfiles.h .
 
 	mkdir -p IOKit/storage
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IOStorageFamily-*/*.h IOKit/storage
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IOCDStorageFamily-*/*.h IOKit/storage
-	cp -R -p "${DARWIN_SOURCES_DIR}"/IODVDStorageFamily-*/*.h IOKit/storage
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IOStorageFamily-*/*.h IOKit/storage
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IOCDStorageFamily-*/*.h IOKit/storage
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/IODVDStorageFamily-*/*.h IOKit/storage
 
 	mkdir DirectoryService
-	cp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/APIFramework/*.h DirectoryService
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/APIFramework/*.h DirectoryService
 
 	mkdir DirectoryServiceCore
-	cp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/CoreFramework/Private/*.h DirectoryServiceCore
-	cp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/CoreFramework/Public/*.h DirectoryServiceCore 
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/CoreFramework/Private/*.h DirectoryServiceCore
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/DirectoryService-*/CoreFramework/Public/*.h DirectoryServiceCore 
 
 	mkdir -p SystemConfiguration
 	echo "configd"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/configd-*/SystemConfiguration.fproj/*.h SystemConfiguration
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/configd-*/SystemConfiguration.fproj/*.h SystemConfiguration
 
 	echo "CoreFoundation"
 	mkdir CoreFoundation
-	cp -R -p "${LEOPARD_SDK_LIBS}"/CoreFoundation.framework/Versions/A/Headers/* CoreFoundation
-	cp -R -pf "${DARWIN_SOURCES_DIR}"/CF-*/*.h CoreFoundation
-	cp -R -pf "${IPHONE_SDK_LIBS}"/CoreFoundation.framework/Headers/* CoreFoundation
+	gcp -R -p "${LEOPARD_SDK_LIBS}"/CoreFoundation.framework/Versions/A/Headers/* CoreFoundation
+	gcp -R -pf "${DARWIN_SOURCES_DIR}"/CF-*/*.h CoreFoundation
+	gcp -R -pf "${IPHONE_SDK_LIBS}"/CoreFoundation.framework/Headers/* CoreFoundation
 
 	for framework in AudioToolbox AudioUnit CoreAudio QuartzCore Foundation; do
 		echo $framework
 		mkdir -p $framework
-		cp -R -p "${LEOPARD_SDK_LIBS}"/"${framework}".framework/Versions/?/Headers/* "${framework}"
-		cp -R -pf "${IPHONE_SDK_LIBS}"/"${framework}".framework/Headers/* "${framework}"
+		gcp -R -p "${LEOPARD_SDK_LIBS}"/"${framework}".framework/Versions/?/Headers/* "${framework}"
+		gcp -R -pf "${IPHONE_SDK_LIBS}"/"${framework}".framework/Headers/* "${framework}"
 	done
 
 	for framework in UIKit AddressBook CoreLocation OpenGLES; do
 		echo $framework
 		mkdir -p $framework
-		cp -R -pf "${IPHONE_SDK_LIBS}"/"${framework}".framework/Headers/* "${framework}"
+		gcp -R -pf "${IPHONE_SDK_LIBS}"/"${framework}".framework/Headers/* "${framework}"
 	done
 
 	for framework in AppKit Cocoa CoreData CoreVideo JavaScriptCore OpenGL WebKit; do
 		echo $framework
 		mkdir -p $framework
-		cp -R -p "${LEOPARD_SDK_LIBS}"/"${framework}".framework/Versions/?/Headers/* $framework
+		gcp -R -p "${LEOPARD_SDK_LIBS}"/"${framework}".framework/Versions/?/Headers/* $framework
 	done
 	
 	echo "Application Services"
 	mkdir -p ApplicationServices
-	cp -R -p "${LEOPARD_SDK_LIBS}"/ApplicationServices.framework/Versions/A/Headers/* ApplicationServices
+	gcp -R -p "${LEOPARD_SDK_LIBS}"/ApplicationServices.framework/Versions/A/Headers/* ApplicationServices
 	for service in "${LEOPARD_SDK_LIBS}"/ApplicationServices.framework/Versions/A/Frameworks/*.framework; do
 		echo -e "¥t$(basename $service .framework)"
 		mkdir -p "$(basename $service .framework)"
@@ -770,37 +772,37 @@
 
 	echo "Core Services"
 	mkdir -p CoreServices
-	cp -R -p "${LEOPARD_SDK_LIBS}"/CoreServices.framework/Versions/A/Headers/* CoreServices
+	gcp -R -p "${LEOPARD_SDK_LIBS}"/CoreServices.framework/Versions/A/Headers/* CoreServices
 	for service in "${LEOPARD_SDK_LIBS}"/CoreServices.framework/Versions/A/Frameworks/*.framework; do
 		mkdir -p "$(basename $service .framework)"
-		cp -R -p $service/Versions/A/Headers/* "$(basename $service .framework)"
+		gcp -R -p $service/Versions/A/Headers/* "$(basename $service .framework)"
 	done
 
 	mkdir WebCore
 	echo "WebCore"
-	cp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/bindings/objc/*.h WebCore
-	cp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/bridge/mac/*.h WebCore 
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/bindings/objc/*.h WebCore
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/bridge/mac/*.h WebCore 
 	for subdir in css dom editing history html loader page platform{,/{graphics,text}} rendering; do
-		cp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/"${subdir}"/*.h WebCore
+		gcp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/"${subdir}"/*.h WebCore
 	done
 
-	cp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/css/CSSPropertyNames.in WebCore
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/WebCore-*/css/CSSPropertyNames.in WebCore
 	(cd WebCore; perl "${DARWIN_SOURCES_DIR}"/WebCore-*/css/makeprop.pl)
 
 	mkdir kjs
-	cp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/kjs/*.h kjs
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/kjs/*.h kjs
 
 	mkdir -p wtf/unicode/icu
-	cp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/*.h wtf
-	cp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/unicode/*.h wtf/unicode
-	cp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/unicode/icu/*.h wtf/unicode/icu
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/*.h wtf
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/unicode/*.h wtf/unicode
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/wtf/unicode/icu/*.h wtf/unicode/icu
 
 	mkdir unicode
-	cp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/icu/unicode/*.h unicode
+	gcp -R -p "${DARWIN_SOURCES_DIR}"/JavaScriptCore-*/icu/unicode/*.h unicode
 	
 	cd "$SYS_DIR"
-	ln -sf gcc/darwin/4.0/stdint.h usr/include
-	ln -sf libstdc++.6.dylib usr/lib/libstdc++.dylib
+	gln -sf gcc/darwin/4.0/stdint.h usr/include
+	gln -sf libstdc++.6.dylib usr/lib/libstdc++.dylib
 
 	message_status "Applying patches..."
 
@@ -826,6 +828,7 @@
 
 	popd
 
+
 	# Changed some of the below commands from sudo; don't know why they were like that
 	message_status "Checking out iphone-dev repo..."
 	mkdir -p "${CSU_DIR}"
@@ -840,12 +843,12 @@
 		svn co http://iphone-dev.googlecode.com/svn/trunk/csu .
 	fi
 
-	cp -R -p *.o "$SYS_DIR/usr/lib"
-	cp -H -p "$IPHONE_SDK/usr/lib/libc.dylib" "$SYS_DIR/usr/lib/"
+	gcp -R -p *.o "$SYS_DIR/usr/lib"
+	gcp -H -p "$IPHONE_SDK/usr/lib/libc.dylib" "$SYS_DIR/usr/lib/"
 	cd "$SYS_DIR/usr/lib"
 	chmod 644 *.o
-	cp -R -pf crt1.o crt1.10.5.o
-	cp -R -pf dylib1.o dylib1.10.5.o
+	gcp -R -pf crt1.o crt1.10.5.o
+	gcp -R -pf dylib1.o dylib1.10.5.o
 
 	if [ ! -d $GCC_DIR ]; then
 		message_status "Checking out saurik's llvm-gcc-4.2..."
@@ -885,7 +888,7 @@
 	mkdir -p "$BUILD_DIR/cctools-iphone"
 	cd "$BUILD_DIR/cctools-iphone"
 
-	CFLAGS="-m32" LDFLAGS="-m32" "${CCTOOLS_DIR}"/configure ¥
+	CC="gcc -arch i386" CXX="g++ -arch i386 -L/opt/local/lib" CFLAGS="" LDFLAGS="" "${CCTOOLS_DIR}"/configure ¥
 		--target="${TARGET}" ¥
 		--prefix="$PREFIX" ¥
 		--enable-ld64
@@ -901,7 +904,7 @@
 
 	# default linker is now ld64
 	mv "${PREFIX}/bin/arm-apple-darwin9-ld" "${PREFIX}/bin/arm-apple-darwin9-ld_classic"
-	ln -s "${PREFIX}/bin/arm-apple-darwin9-ld64" "${PREFIX}/bin/arm-apple-darwin9-ld"
+	gln -s "${PREFIX}/bin/arm-apple-darwin9-ld64" "${PREFIX}/bin/arm-apple-darwin9-ld"
 
 	message_status "Configuring gcc-4.2-iphone..."
 	mkdir -p "${BUILD_DIR}/gcc-4.2-iphone"
@@ -924,7 +927,7 @@
 	fi
 
 	mkdir -p "$SYS_DIR"/"$(dirname $PREFIX)"
-	ln -sf "$PREFIX" "$SYS_DIR"/"$(dirname $PREFIX)"
+	gln -sf "$PREFIX" "$SYS_DIR"/"$(dirname $PREFIX)"
 }
 
 class_dump() {