Changeset 12735849 in mainline

Timestamp:

2013-12-08T15:41:10Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3558ba93

Parents:

a0ff947

Message:

Read toolchain patches from the correct directory.

When running toolchain.sh with current directory other than tools
subdirectory of the HelenOS sources, the script was unable to
correctly read toolchain patches, as it was trying to read them
from BASEDIR (i.e. the current working directory when running
the script).

This changeset explicitly uses path to the patches relative to
the location of the directory where the toolchain script resides
(the newly introduced SRCDIR variable).

File:

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

tools/toolchain.sh

@@ -62 +62 @@
 
 BASEDIR="`pwd`"
+SRCDIR="$(readlink -f $(dirname "$0"))"
 BINUTILS="binutils-${BINUTILS_VERSION}${BINUTILS_RELEASE}.tar.bz2"
 GCC="gcc-${GCC_VERSION}.tar.bz2"
@@ -440 +441 @@
         echo ">>> Applying patches"
         for p in $BINUTILS_PATCHES; do
-                patch_sources "${BASEDIR}/${p}" 0 "binutils"
+                patch_sources "${SRCDIR}/${p}" 0 "binutils"
         done
         for p in $GCC_PATCHES; do
-                patch_sources "${BASEDIR}/${p}" 0 "GCC"
+                patch_sources "${SRCDIR}/${p}" 0 "GCC"
         done
         for p in $GDB_PATCHES; do
-                patch_sources "${BASEDIR}/${p}" 0 "GDB"
+                patch_sources "${SRCDIR}/${p}" 0 "GDB"
         done