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

File:

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

tools/toolchain.sh

@@ -283 +283 @@
         ORIGINAL="`pwd`"
         
+        mkdir -p "${OUTSIDE}"
+        
         cd "${OUTSIDE}"
         check_error $? "Unable to change directory to ${OUTSIDE}."
@@ -443 +445 @@
         
         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 +478 @@
                 "--target=${TARGET}" \
                 "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                --disable-nls --disable-werror
+                --disable-nls --disable-werror --enable-gold
         check_error $? "Error configuring binutils."
         
@@ -486 +486 @@
         
         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 +509 @@
         
         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 +523 @@
                         "--target=${TARGET}" \
                         "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
-                        --enable-werror=no
+                        --enable-werror=no --without-guile
                 check_error $? "Error configuring GDB."
                 
@@ -539 +531 @@
                 
                 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}"