Changeset 95c675b in mainline for tools/toolchain.sh

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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:

Merge mainline

File:

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

tools/toolchain.sh

@@ -73 +73 @@
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
-INSTALL_DIR="${BASEDIR}/PKG"
 
 #
@@ -283 +282 @@
         ORIGINAL="`pwd`"
         
+        mkdir -p "${OUTSIDE}"
+        
         cd "${OUTSIDE}"
         check_error $? "Unable to change directory to ${OUTSIDE}."
@@ -358 +359 @@
         case "$1" in
                 "amd64")
-                        LINUX_TARGET="amd64-linux-gnu"
+                        LINUX_TARGET="amd64-unknown-elf"
                         HELENOS_TARGET="amd64-helenos"
                         ;;
@@ -418 +419 @@
         fi
         
-        WORKDIR="${BASEDIR}/${PLATFORM}"
+        WORKDIR="${BASEDIR}/${TARGET}"
+        INSTALL_DIR="${WORKDIR}/PKG"
         BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
         GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
@@ -427 +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"
@@ -443 +438 @@
         
         echo ">>> Removing previous content"
-        $REAL_INSTALL && cleanup_dir "${PREFIX}"
         cleanup_dir "${WORKDIR}"
         
-        $REAL_INSTALL && create_dir "${PREFIX}" "destination directory"
         create_dir "${OBJDIR}" "GCC object directory"
         
@@ -478 +471 @@
                 "--target=${TARGET}" \
                 "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                --disable-nls --disable-werror
+                --disable-nls --disable-werror --enable-gold
         check_error $? "Error configuring binutils."
         
@@ -486 +479 @@
         
         change_title "binutils: install (${PLATFORM})"
-        if $REAL_INSTALL ; then
-                make install
-        else
-                make install "DESTDIR=${INSTALL_DIR}"
-        fi
+        make install "DESTDIR=${INSTALL_DIR}"
         check_error $? "Error installing binutils."
         
@@ -513 +502 @@
         
         change_title "GCC: install (${PLATFORM})"
-        if $REAL_INSTALL ; then
-                PATH="${PATH}:${PREFIX}/bin" make install-gcc
-        else
-                PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install-gcc "DESTDIR=${INSTALL_DIR}"
-        fi
+        PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install-gcc "DESTDIR=${INSTALL_DIR}"
         check_error $? "Error installing GCC."
         
@@ -531 +516 @@
                         "--target=${TARGET}" \
                         "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                        --enable-werror=no
+                        --enable-werror=no --without-guile
                 check_error $? "Error configuring GDB."
                 
@@ -539 +524 @@
                 
                 change_title "GDB: make (${PLATFORM})"
-                if $REAL_INSTALL ; then
-                        PATH="${PATH}:${PREFIX}/bin" make install
-                else
-                        PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install "DESTDIR=${INSTALL_DIR}"
-                fi
+                PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install "DESTDIR=${INSTALL_DIR}"
                 check_error $? "Error installing GDB."
         fi
         
+        # Symlink clang and lld to the install path.
+        CLANG=`which clang 2> /dev/null || echo "/usr/bin/clang"`
+        LLD=`which ld.lld 2> /dev/null || echo "/usr/bin/ld.lld"`
+        
+        ln -s $CLANG "${INSTALL_DIR}/${PREFIX}/bin/${TARGET}-clang"
+        ln -s $LLD "${INSTALL_DIR}/${PREFIX}/bin/${TARGET}-ld.lld"
+        
+        if $REAL_INSTALL ; then
+                echo ">>> Moving to the destination directory."
+                cleanup_dir "${PREFIX}"
+                echo mv "${INSTALL_DIR}/${PREFIX}" "${PREFIX}"
+                mv "${INSTALL_DIR}/${PREFIX}" "${PREFIX}"
+        fi
         
         cd "${BASEDIR}"