Changes in tools/toolchain.sh [d965dc3:285589b] in mainline

File:

• tools/toolchain.sh (modified) (4 diffs)

tools/toolchain.sh

@@ -55 +55 @@
 BINUTILS_VERSION="2.23.1"
 BINUTILS_RELEASE=""
-GCC_VERSION="4.8.0"
-GDB_VERSION="7.5.1"
+GCC_VERSION="4.8.1"
+GDB_VERSION="7.6"
 
 BASEDIR="`pwd`"
@@ -254 +254 @@
 }
 
+check_dirs() {
+        OUTSIDE="$1"
+        BASE="$2"
+        ORIGINAL="`pwd`"
+        
+        cd "${OUTSIDE}"
+        check_error $? "Unable to change directory to ${OUTSIDE}."
+        ABS_OUTSIDE="`pwd`"
+        
+        cd "${BASE}"
+        check_error $? "Unable to change directory to ${BASE}."
+        ABS_BASE="`pwd`"
+        
+        cd "${ORIGINAL}"
+        check_error $? "Unable to change directory to ${ORIGINAL}."
+        
+        BASE_LEN="${#ABS_BASE}"
+        OUTSIDE_TRIM="${ABS_OUTSIDE:0:${BASE_LEN}}"
+        
+        if [ "${OUTSIDE_TRIM}" == "${ABS_BASE}" ] ; then
+                echo
+                echo "CROSS_PREFIX cannot reside within the working directory."
+                
+                exit 5
+        fi
+}
+
 unpack_tarball() {
         FILE="$1"
@@ -275 +302 @@
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "33adb18c3048d057ac58d07a3f1adb38"
-        download_fetch "${GCC_SOURCE}" "${GCC}" "e6040024eb9e761c3bea348d1fa5abb0"
-        download_fetch "${GDB_SOURCE}" "${GDB}" "3f48f468b24447cf24820054ff6e85b1"
+        download_fetch "${GCC_SOURCE}" "${GCC}" "3b2386c114cd74185aa3754b58a79304"
+        download_fetch "${GDB_SOURCE}" "${GDB}" "fda57170e4d11cdde74259ca575412a8"
 }
 
@@ -306 +333 @@
         create_dir "${PREFIX}" "destination directory"
         create_dir "${OBJDIR}" "GCC object directory"
+        
+        check_dirs "${PREFIX}" "${WORKDIR}"
         
         echo ">>> Unpacking tarballs"