Changeset aefdccd in mainline for tools/toolchain.sh

Timestamp:

2025-10-20T06:14:54Z (8 weeks ago)

Author:

GitHub <noreply@…>

Parents:

adbd7e1 (diff), 3e41cc4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2025-10-20 06:14:54)

git-committer:

GitHub <noreply@…> (2025-10-20 06:14:54)

Message:

Merge branch 'HelenOS:master' into ticket/packet-capture

File:

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

tools/toolchain.sh

@@ -31 +31 @@
 BINUTILS_GDB_GIT="https://github.com/HelenOS/binutils-gdb.git"
 
-BINUTILS_BRANCH="binutils-2_43-helenos"
-BINUTILS_VERSION="2.43"
-
-GDB_BRANCH="gdb-13.2-helenos"
-GDB_VERSION="13.2"
+BINUTILS_BRANCH="binutils-2_45-helenos"
+BINUTILS_VERSION="2.45"
 
 GCC_GIT="https://github.com/HelenOS/gcc.git"
-GCC_BRANCH="14_2_0-helenos"
-GCC_VERSION="14.2"
+GCC_BRANCH="15_2_0-helenos"
+GCC_VERSION="15.2"
 
 BASEDIR="$PWD"
@@ -51 +48 @@
 SYSTEM_INSTALL=false
 
-BUILD_GDB=false
 BUILD_BINUTILS=true
 BUILD_GCC=true
@@ -72 +68 @@
         echo
         echo "Syntax:"
-        echo " $0 [--system-wide] [--with-gdb|--only-gdb] <platform>"
         echo " $0 [--system-wide] --test-version [<platform>]"
         echo
@@ -147 +142 @@
                 test_app_version "Binutils" "ld" "GNU ld (.*) \([.0-9]*\)" "$BINUTILS_VERSION"
                 test_app_version "GCC" "gcc" "gcc version \([.0-9]*\)" "$GCC_VERSION"
-                test_app_version "GDB" "gdb" "GNU gdb (.*)[[:space:]]\+\([.0-9]*\)" "$GDB_VERSION"
         done
 }
@@ -264 +258 @@
                 ( set -x ; sudo -k mkdir -p "${CROSS_PREFIX}" )
         else
-                mkdir -p "${CROSS_PREFIX}"
+                ( set -x ; mkdir -p "${CROSS_PREFIX}" )
         fi
 
@@ -310 +304 @@
                 ./contrib/download_prerequisites
                 cd ..
-        fi
-
-        if $BUILD_GDB ; then
-                git clone --depth 1 -b "$GDB_BRANCH" "$BINUTILS_GDB_GIT" "gdb-$GDB_VERSION"
-                git -C "gdb-$GDB_VERSION" pull
         fi
 
@@ -466 +455 @@
 }
 
-build_gdb() {
-        # This sets the TARGET variable
-        set_target_from_platform "$1"
-
-        WORKDIR="${BASEDIR}/${TARGET}"
-        GDBDIR="${WORKDIR}/gdb-${GDB_VERSION}"
-
-        echo ">>> Removing previous content"
-        cleanup_dir "${WORKDIR}"
-        mkdir -p "${WORKDIR}"
-
-        echo ">>> Processing GDB (${TARGET})"
-        mkdir -p "${GDBDIR}"
-        cd "${GDBDIR}"
-        check_error $? "Change directory failed."
-
-        change_title "GDB: configure (${TARGET})"
-        CFLAGS="-fcommon" "${BASEDIR}/downloads/gdb-${GDB_VERSION}/configure" \
-                "--target=${TARGET}" \
-                "--prefix=${CROSS_PREFIX}" \
-                "--program-prefix=${TARGET}-" \
-                --enable-werror=no
-        check_error $? "Error configuring GDB."
-
-        change_title "GDB: make (${TARGET})"
-        make all-gdb -j$JOBS
-        check_error $? "Error compiling GDB."
-
-        change_title "GDB: install (${TARGET})"
-        make install-gdb $DESTDIR_SPEC
-        check_error $? "Error installing GDB."
-}
-
 install_pkg() {
         echo ">>> Moving to the destination directory."
         if $SYSTEM_INSTALL ; then
                 ring_bell
-                ( set -x ; sudo -k cp -r -t "${CROSS_PREFIX}" "${INSTALL_DIR}${CROSS_PREFIX}/"* )
+                ( set -x ; tar -C "${INSTALL_DIR}${CROSS_PREFIX}" -cpf - . | sudo -k tar -C "${CROSS_PREFIX}" -xpf - )
         else
-                ( set -x ; cp -r -t "${CROSS_PREFIX}" "${INSTALL_DIR}${CROSS_PREFIX}/"* )
+                ( set -x ; tar -C "${INSTALL_DIR}${CROSS_PREFIX}" -cpf - . | tar -C "${CROSS_PREFIX}" -xpf - )
         fi
 }
@@ -530 +486 @@
                         exit
                         ;;
-                --with-gdb)
-                        BUILD_GDB=true
-                        shift
-                        ;;
-                --only-gdb)
-                        BUILD_GDB=true
-                        BUILD_BINUTILS=false
-                        BUILD_GCC=false
-                        shift
-                        ;;
                 *)
                         show_usage
@@ -614 +560 @@
 
                 $RUNNER build_libgcc
-        fi
-
-        if $BUILD_GDB ; then
-                $RUNNER build_gdb
         fi