Changeset 591b989 in mainline

Timestamp:

2017-10-09T15:34:33Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

ca207e0

Parents:

b08941d

Message:

Change toolchain.sh to install into target-specific directory.

File:

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

tools/toolchain.sh

@@ -73 +73 @@
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
-INSTALL_DIR="${BASEDIR}/PKG"
 
 #
@@ -420 +419 @@
         fi
         
-        WORKDIR="${BASEDIR}/${PLATFORM}"
+        WORKDIR="${BASEDIR}/${TARGET}"
+        INSTALL_DIR="${WORKDIR}/PKG"
         BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
         GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
@@ -429 +429 @@
                 CROSS_PREFIX="/usr/local/cross"
         fi
-        if [ -z "${CROSS_HELENOS_PREFIX}" ] ; then
-                CROSS_HELENOS_PREFIX="/usr/local/cross-helenos"
-        fi
-        
-        if $USE_HELENOS_TARGET ; then
-                PREFIX="${CROSS_HELENOS_PREFIX}/${PLATFORM}"
-        else
-                PREFIX="${CROSS_PREFIX}/${PLATFORM}"
-        fi
+        
+        PREFIX="${CROSS_PREFIX}/${TARGET}"
         
         echo ">>> Downloading tarballs"