Changes in tools/toolchain.sh [0557618:f3a7b0d] in mainline

File:

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

tools/toolchain.sh

@@ -31 +31 @@
 BINUTILS_GDB_GIT="https://github.com/HelenOS/binutils-gdb.git"
 
-BINUTILS_BRANCH="binutils-2_40-helenos"
-BINUTILS_VERSION="2.40"
+BINUTILS_BRANCH="binutils-2_31_1-helenos"
+BINUTILS_VERSION="2.31.1"
 
 GDB_BRANCH="gdb-8_2-helenos"
@@ -38 +38 @@
 
 GCC_GIT="https://github.com/HelenOS/gcc.git"
-GCC_BRANCH="13_1_1-helenos"
-GCC_VERSION="13.1.1"
+GCC_BRANCH="8_2_0-helenos"
+GCC_VERSION="8.2.0"
 
 BASEDIR="$PWD"
@@ -414 +414 @@
         check_error $? "Change directory failed."
 
+        if $USE_HELENOS_TARGET ; then
+                SYSROOT=--with-sysroot --with-build-sysroot="${WORKDIR}/sysroot"
+        else
+                SYSROOT=--without-headers
+        fi
+
         change_title "GCC: configure (${PLATFORM})"
         PATH="$PATH:${INSTALL_DIR}/${PREFIX}/bin" "${BASEDIR}/downloads/gcc-${GCC_VERSION}/configure" \
@@ -426 +432 @@
                 --disable-shared \
                 --disable-werror \
-                --without-headers
+                $SYSROOT
         check_error $? "Error configuring GCC."