Changeset 367db39a in mainline

Timestamp:

2017-10-21T22:33:29Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

c8fbbe7, e160bfe8

Parents:

5265c1eb

Message:

If isl is not found on the system, build it ourselves.

This is useful because, for example,
Arch Linux does not provide an official package for isl.

File:

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

tools/toolchain.sh

@@ -64 +64 @@
 GDB_VERSION="7.12.1"
 ## GDB_PATCHES="toolchain-gdb-7.6.1.patch"
+ISL_VERSION="0.18"
 
 BASEDIR="`pwd`"
@@ -70 +71 @@
 GCC="gcc-${GCC_VERSION}.tar.bz2"
 GDB="gdb-${GDB_VERSION}.tar.gz"
+ISL="isl-${ISL_VERSION}.tar.bz2"
 
 REAL_INSTALL=true
 USE_HELENOS_TARGET=false
+BUILD_ISL=false
 
 #
@@ -97 +100 @@
         
         if [ "$RC" -ne "0" ] ; then
-                echo " ${DEPENDENCY} not found, too old or compiler error."
-                echo " Please recheck manually the source file \"${FNAME}.c\"."
-                echo " The compilation of the toolchain is probably going to fail,"
-                echo " you have been warned."
-                echo
-                echo " ===== Compiler output ====="
-                cat "${FNAME}.log"
-                echo " ==========================="
-                echo
+                if [ "${DEPENDENCY}" == "isl" ]; then
+                        BUILD_ISL=true
+                        
+                        echo " isl not found. Will be downloaded and built with GCC."
+                else
+                        echo " ${DEPENDENCY} not found, too old or compiler error."
+                        echo " Please recheck manually the source file \"${FNAME}.c\"."
+                        echo " The compilation of the toolchain is probably going to fail,"
+                        echo " you have been warned."
+                        echo
+                        echo " ===== Compiler output ====="
+                        cat "${FNAME}.log"
+                        echo " ==========================="
+                        echo
+                fi
         else
                 echo " ${DEPENDENCY} found"
@@ -352 +361 @@
         GCC_SOURCE="ftp://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/"
         GDB_SOURCE="ftp://ftp.gnu.org/gnu/gdb/"
+        ISL_SOURCE="http://isl.gforge.inria.fr/"
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "9e8340c96626b469a603c15c9d843727"
         download_fetch "${GCC_SOURCE}" "${GCC}" "6bf56a2bca9dac9dbbf8e8d1036964a8"
         download_fetch "${GDB_SOURCE}" "${GDB}" "06c8f40521ed65fe36ebc2be29b56942"
+        
+        if $BUILD_ISL ; then
+                download_fetch "${ISL_SOURCE}" "${ISL}" "11436d6b205e516635b666090b94ab32"
+        fi
 }
 
@@ -425 +439 @@
         BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
         GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
+        ISLDIR="${WORKDIR}/isl-${ISL_VERSION}"
         OBJDIR="${WORKDIR}/gcc-obj"
         GDBDIR="${WORKDIR}/gdb-${GDB_VERSION}"
@@ -438 +453 @@
         source_check "${BASEDIR}/${GCC}"
         source_check "${BASEDIR}/${GDB}"
+        if $BUILD_ISL ; then
+                source_check "${BASEDIR}/${ISL}"
+        fi
         
         echo ">>> Removing previous content"
@@ -453 +471 @@
         unpack_tarball "${BASEDIR}/${GCC}" "GCC"
         unpack_tarball "${BASEDIR}/${GDB}" "GDB"
+        if $BUILD_ISL ; then
+                unpack_tarball "${BASEDIR}/${ISL}" "isl"
+                mv "${ISLDIR}" "${GCCDIR}"/isl
+        fi
         
         echo ">>> Applying patches"