From 1200ec5a532220b3349d97de1b91f860ae2d2de2 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Tue, 1 Nov 2011 22:39:41 +0100
Subject: buildgcc: Update coreboot reference toolchain to gcc 4.6.2

In addition:
- drop some unneeded patches
- make the scripting support depend on SKIPPYTHON not SKIPGDB
  so it is possible to build GDB with and without scripting support
- rename the repository checkout version of GCC trunk, not X+1
  so we don't have to change it on every version upgrade.

Change-Id: I1b7d5b8921187c1c1d39b04f20bb715ddba72fe8
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/367
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 util/crossgcc/buildgcc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'util/crossgcc/buildgcc')

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index b0918c0c60..891819137d 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -21,7 +21,7 @@
 #
 
 CROSSGCC_DATE="November 1st, 2011"
-CROSSGCC_VERSION="1.06"
+CROSSGCC_VERSION="1.07"
 
 # default settings
 TARGETDIR=`pwd`/xgcc
@@ -33,7 +33,7 @@ GMP_VERSION=5.0.2
 MPFR_VERSION=3.1.0
 MPC_VERSION=0.9
 LIBELF_VERSION=0.8.13
-GCC_VERSION=4.6.1
+GCC_VERSION=4.6.2
 GCC_AUTOCONF_VERSION=2.64
 BINUTILS_VERSION=2.21.1
 GDB_VERSION=7.3.1
@@ -225,7 +225,7 @@ fi
 USE_GOLD=""
 GCC_OPTIONS="--enable-lto"
 
-if [ ${GCC_VERSION} = "4.6.2" ]; then
+if [ ${GCC_VERSION} = "trunk" ]; then
   if [ ! -r tarballs/gcc-core-${GCC_VERSION}.tar.bz2 ]; then
     printf "Pre-Release GCC ${GCC_VERSION}, checking out subversion trunk\n"
     mkdir -p tarballs/.tmp
@@ -499,8 +499,8 @@ fi
 
 if [ -f build-expat/.success ]; then
 	printf "Skipping Expat as it is already built\n"
-elif [ $SKIPGDB -eq 1 ]; then
-	printf "Skipping Expat as requested by command line (skip GDB)\n"
+elif [ $SKIPPYTHON -eq 1 ]; then
+	printf "Skipping Expat (Python scripting not enabled)\n"
 else
 printf "Building Expat ${EXPAT_VERSION} ... "
 (
@@ -521,8 +521,8 @@ fi
 
 if [ -f build-python/.success ]; then
 	printf "Skipping Python as it is already built\n"
-elif [ $SKIPGDB -eq 1 ]; then
-	printf "Skipping Python as requested by command line (skip GDB)\n"
+elif [ $SKIPPYTHON -eq 1 ]; then
+	printf "Skipping Python (Python scripting not enabled)\n"
 else
 printf "Building Python ${PYTHON_VERSION} ... "
 (
@@ -544,7 +544,7 @@ fi
 if [ -f build-gdb/.success ]; then
 	printf "Skipping GDB as it is already built\n"
 elif [ $SKIPGDB -eq 1 ]; then
-	printf "Skipping GDB as requested by command line\n"
+	printf "Skipping GDB (GDB support not enabled)\n"
 else
 printf "Building GDB ${GDB_VERSION} ... "
 (
-- 
cgit v1.2.3