diff --git a/build.sh b/build.sh
index 3f68ea9a60..e108b39ea3 100755
--- a/build.sh
+++ b/build.sh
@@ -11,7 +11,6 @@ set -e
 ALLPROGS="gcc coreutils diffutils grep make gzip patch tar bzip2 bison"
 BBTOOLS=
 LOGIN="guest --password \"\""
-MYIP=`ruby -rsocket -e 'p IPSocket.getaddress(Socket.gethostname)' | tr -d \"`
 TASK=all
 SUBTASKFLAG=
 SUBTASK=
@@ -55,8 +54,6 @@ if [ -e "conf/ip" ]; then
   MYIP=`cat conf/ip`
 fi
 
-URL="http://$MYIP:8888"
-
 if [[ -z $BBTOOLS ]] || [[ -z $LOGIN ]]
 then
   usage
@@ -113,6 +110,25 @@ fi
 
 if [ "$TASK" == "deploy" ]
 then
+  IPS=( `ifconfig | grep "inet " | awk '{print $2}'` )
+  NUMOFIPS=${#IPS[@]}
+  if [ $NUMOFIPS -gt 1 ]; then
+    j=-1
+    while [ $j -eq -1 ]; do
+      echo "Please choose on which IP we'll be listening to download requests from PlayBook:"
+      for (( i=0;i<$NUMOFIPS;i++)); do echo $i\) ${IPS[$i]}; done
+      echo -n Your choice:
+      read j
+      if [ $j -lt 0 ] ; then j=-1; fi
+      let i=$NUMOFIPS-1
+      if [ $j -gt $i ] ; then j=-1; fi
+    done
+  else
+    j=0
+  fi
+  MYIP=${IPS[$j]}
+  URL="http://$MYIP:8888"
+
   cd "$PBBUILDDIR"
   cat pbinstallhead.sh                    > pbinstall.sh
   echo "./bin/pwget \"$URL/pbhome.zip\""  >> pbinstall.sh
diff --git a/gcc/patches/configure.tgt.diff b/gcc/patches/configure.tgt.diff
new file mode 100644
index 0000000000..7856091573
--- /dev/null
+++ b/gcc/patches/configure.tgt.diff
@@ -0,0 +1,11 @@
+--- configure.tgt.orig	2012-07-13 12:53:12.000000000 -0400
++++ configure.tgt	2012-07-13 11:10:39.000000000 -0400
+@@ -118,7 +118,7 @@
+   arm-*-uclinux*)			fmt=elf  em=linux ;;
+   arm-*-netbsdelf*)                 	fmt=elf  em=nbsd ;;
+   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
+-  arm-*-nto*)				fmt=elf ;;
++  arm-*-nto*)				fmt=elf need_libm=yes ;;
+   arm-epoc-pe | thumb-epoc-pe)		fmt=coff em=epoc-pe ;;
+   arm-wince-pe | arm-*-wince)		fmt=coff em=wince-pe ;;
+   arm-*-pe | thumb-*-pe)		fmt=coff em=pe ;;