Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 12735849 in mainline


Ignore:
Timestamp:
2013-12-08T15:41:10Z (8 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/toolchain.sh

    ra0ff947 r12735849  
    6262
    6363BASEDIR="`pwd`"
     64SRCDIR="$(readlink -f $(dirname "$0"))"
    6465BINUTILS="binutils-${BINUTILS_VERSION}${BINUTILS_RELEASE}.tar.bz2"
    6566GCC="gcc-${GCC_VERSION}.tar.bz2"
     
    440441        echo ">>> Applying patches"
    441442        for p in $BINUTILS_PATCHES; do
    442                 patch_sources "${BASEDIR}/${p}" 0 "binutils"
     443                patch_sources "${SRCDIR}/${p}" 0 "binutils"
    443444        done
    444445        for p in $GCC_PATCHES; do
    445                 patch_sources "${BASEDIR}/${p}" 0 "GCC"
     446                patch_sources "${SRCDIR}/${p}" 0 "GCC"
    446447        done
    447448        for p in $GDB_PATCHES; do
    448                 patch_sources "${BASEDIR}/${p}" 0 "GDB"
     449                patch_sources "${SRCDIR}/${p}" 0 "GDB"
    449450        done
    450451       
Note: See TracChangeset for help on using the changeset viewer.