Changes in tools/toolchain.sh [bfdb7c63:951f6b9e] in mainline

File:

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

tools/toolchain.sh

@@ -73 +73 @@
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
+INSTALL_DIR="${BASEDIR}/PKG"
 
 #
@@ -282 +283 @@
         ORIGINAL="`pwd`"
         
-        mkdir -p "${OUTSIDE}"
-        
         cd "${OUTSIDE}"
         check_error $? "Unable to change directory to ${OUTSIDE}."
@@ -359 +358 @@
         case "$1" in
                 "amd64")
-                        LINUX_TARGET="amd64-unknown-elf"
+                        LINUX_TARGET="amd64-linux-gnu"
                         HELENOS_TARGET="amd64-helenos"
                         ;;
@@ -419 +418 @@
         fi
         
-        WORKDIR="${BASEDIR}/${TARGET}"
-        INSTALL_DIR="${WORKDIR}/PKG"
+        WORKDIR="${BASEDIR}/${PLATFORM}"
         BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
         GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
@@ -429 +427 @@
                 CROSS_PREFIX="/usr/local/cross"
         fi
-        
-        PREFIX="${CROSS_PREFIX}/${TARGET}"
+        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
         
         echo ">>> Downloading tarballs"
@@ -438 +443 @@
         
         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"
         
@@ -471 +478 @@
                 "--target=${TARGET}" \
                 "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                --disable-nls --disable-werror --enable-gold
+                --disable-nls --disable-werror
         check_error $? "Error configuring binutils."
         
@@ -479 +486 @@
         
         change_title "binutils: install (${PLATFORM})"
-        make install "DESTDIR=${INSTALL_DIR}"
+        if $REAL_INSTALL ; then
+                make install
+        else
+                make install "DESTDIR=${INSTALL_DIR}"
+        fi
         check_error $? "Error installing binutils."
         
@@ -502 +513 @@
         
         change_title "GCC: install (${PLATFORM})"
-        PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install-gcc "DESTDIR=${INSTALL_DIR}"
+        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
         check_error $? "Error installing GCC."
         
@@ -516 +531 @@
                         "--target=${TARGET}" \
                         "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                        --enable-werror=no --without-guile
+                        --enable-werror=no
                 check_error $? "Error configuring GDB."
                 
@@ -524 +539 @@
                 
                 change_title "GDB: make (${PLATFORM})"
-                PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install "DESTDIR=${INSTALL_DIR}"
+                if $REAL_INSTALL ; then
+                        PATH="${PATH}:${PREFIX}/bin" make install
+                else
+                        PATH="${PATH}:${INSTALL_DIR}/${PREFIX}/bin" make install "DESTDIR=${INSTALL_DIR}"
+                fi
                 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}"