Changeset 99c2c69e in mainline for tools/toolchain.sh

Timestamp:

2013-09-13T00:36:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

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

tools/toolchain.sh

@@ -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"
@@ -306 +333 @@
         create_dir "${PREFIX}" "destination directory"
         create_dir "${OBJDIR}" "GCC object directory"
+        
+        check_dirs "${PREFIX}" "${WORKDIR}"
         
         echo ">>> Unpacking tarballs"