Changeset 85b41bc in mainline for tools/toolchain.sh

Timestamp:

2023-10-24T17:07:29Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

59d469b

Parents:

29ed06d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-24 17:06:42)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-24 17:07:29)

Message:

toolchain.sh: Fix directory check bug introduced previously

File:

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

tools/toolchain.sh

@@ -256 +256 @@
 
 check_dirs() {
-        OUTSIDE="$1"
-        BASE="$2"
-        ORIGINAL="$PWD"
-
-        cd "${BASE}"
-        check_error $? "Unable to change directory to ${BASE}."
+        cd "${BASEDIR}"
+        check_error $? "Unable to change directory to ${BASEDIR}."
         ABS_BASE="$PWD"
-        cd "${ORIGINAL}"
-        check_error $? "Unable to change directory to ${ORIGINAL}."
-
-        if $SYSTEM_INSTALL && [ ! -d "${OUTSIDE}" ]; then
+
+        if $SYSTEM_INSTALL && [ ! -d "${CROSS_PREFIX}" ]; then
                 ring_bell
-                ( set -x ; sudo -k mkdir -p "${OUTSIDE}" )
+                ( set -x ; sudo -k mkdir -p "${CROSS_PREFIX}" )
         else
-                mkdir -p "${OUTSIDE}"
-        fi
-
-        cd "${OUTSIDE}"
-        check_error $? "Unable to change directory to ${OUTSIDE}."
+                mkdir -p "${CROSS_PREFIX}"
+        fi
+
+        cd "${CROSS_PREFIX}"
+        check_error $? "Unable to change directory to ${CROSS_PREFIX}."
 
         while [ "${#PWD}" -gt "${#ABS_BASE}" ]; do
@@ -287 +281 @@
         fi
 
-        cd "${ORIGINAL}"
-        check_error $? "Unable to change directory to ${ORIGINAL}."
+        cd "${BASEDIR}"
 }
 
@@ -328 +321 @@
 
         DESTDIR_SPEC="DESTDIR=${INSTALL_DIR}"
+
+        check_dirs
 }
 
@@ -368 +363 @@
         cleanup_dir "${WORKDIR}"
         mkdir -p "${WORKDIR}"
-        check_dirs "${CROSS_PREFIX}" "${WORKDIR}"
 
         echo ">>> Processing binutils (${PLATFORM})"
@@ -407 +401 @@
         cleanup_dir "${WORKDIR}"
         mkdir -p "${WORKDIR}"
-        check_dirs "${CROSS_PREFIX}" "${WORKDIR}"
 
         echo ">>> Processing GCC (${PLATFORM})"
@@ -482 +475 @@
         cleanup_dir "${WORKDIR}"
         mkdir -p "${WORKDIR}"
-        check_dirs "${CROSS_PREFIX}" "${WORKDIR}"
 
         echo ">>> Processing GDB (${PLATFORM})"