Changeset bbe5e34 in mainline for tools/toolchain.sh

Timestamp:

2018-08-31T14:32:39Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

58e7b26

Parents:

fa86fff

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-08-31 14:32:39)

git-committer:

GitHub <noreply@…> (2018-08-31 14:32:39)

Message:

Switch completely to HelenOS-specific toolchain target (#44)

As previously discussed, utilizing the compiler-provided headers and libraries would
allow us to avoid a number of problems and reduce the amount of architecture-support
code that we have to implement ourselves. With this change, the support for using
Linux-targeted toolchain, or even the host toolchain itself, is removed, due to the
inherent issues caused by such setup.

Additionally, the toolchain installation is a bit simplified to install all targets into a single
prefix. This prefix can be added to the PATH so that one can simply execute
e.g. amd64-helenos-gcc instead of needing to use the whole path.

File:

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

tools/toolchain.sh

@@ -45 +45 @@
 
 REAL_INSTALL=true
-USE_HELENOS_TARGET=false
+USE_HELENOS_TARGET=true
 
 check_error() {
@@ -60 +60 @@
         echo
         echo "Syntax:"
-        echo " $0 [--no-install] [--helenos-target] <platform>"
+        echo " $0 [--no-install] [--non-helenos-target] <platform>"
         echo
         echo "Possible target platforms are:"
@@ -89 +89 @@
         echo "not want to run the script under the super user."
         echo
-        echo "The --helenos-target will build HelenOS-specific toolchain"
-        echo "(i.e. it will use *-helenos triplet instead of *-linux-*)."
-        echo "Using the HelenOS-specific toolchain is still an experimental"
-        echo "feature that is not fully supported."
+        echo "The --non-helenos-target will build non-HelenOS-specific toolchain"
+        echo "(i.e. it will use *-linux-* triplet instead of *-helenos)."
+        echo "Using this toolchain for building HelenOS is not supported."
         echo
 
@@ -238 +237 @@
         HELENOS_TARGET="${GNU_ARCH}-helenos"
 
-        # TODO: Clean up this mess.
         case "$1" in
-                "amd64")
-                        LINUX_TARGET="${GNU_ARCH}-unknown-elf"
-                        ;;
-                "ia32" | "ia64")
-                        LINUX_TARGET="${GNU_ARCH}-pc-linux-gnu"
-                        ;;
                 "arm32")
                         LINUX_TARGET="${GNU_ARCH}-linux-gnueabi"
-                        ;;
-                "riscv64")
-                        LINUX_TARGET="${GNU_ARCH}-unknown-linux-gnu"
                         ;;
                 *)
@@ -283 +272 @@
         fi
 
-        PREFIX="${CROSS_PREFIX}/${TARGET}"
+        PREFIX="${CROSS_PREFIX}"
 
         echo ">>> Removing previous content"
@@ -408 +397 @@
         if $REAL_INSTALL ; then
                 echo ">>> Moving to the destination directory."
-                cleanup_dir "${PREFIX}"
-                echo mv "${INSTALL_DIR}/${PREFIX}" "${PREFIX}"
-                mv "${INSTALL_DIR}/${PREFIX}" "${PREFIX}"
+                echo cp -r -t "${PREFIX}" "${INSTALL_DIR}/${PREFIX}/"*
+                cp -r -t "${PREFIX}" "${INSTALL_DIR}/${PREFIX}/"*
         fi
 
@@ -429 +417 @@
                         shift
                         ;;
-                --helenos-target)
-                        USE_HELENOS_TARGET=true
+                --non-helenos-target)
+                        USE_HELENOS_TARGET=false
                         shift
                         ;;