From b70bef77cb6b4bb9db1e4be735727685f6edaa45 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Tue, 26 Sep 2023 23:55:01 +0200
Subject: [PATCH] make-binaries: Bump crosstool-NG version to 1.26.0

---
 .github/workflows/installers.yml | 2 +-
 tools/make-binaries              | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index cba7777b9..4a026c31c 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/build/
-          key: ${{runner.os}}-ct-ng-1.25.0
+          key: ${{runner.os}}-ct-ng-1.26.0
       - name: Install prerequisites
         run: |
           sudo apt-get -qq update
diff --git a/tools/make-binaries b/tools/make-binaries
index 9840cb5f6..b0c2daad6 100755
--- a/tools/make-binaries
+++ b/tools/make-binaries
@@ -65,7 +65,7 @@ fi
 rel_name='ejabberd'
 rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]')
 mix_vsn=$(mix_version "$rel_vsn")
-crosstool_vsn='1.25.0'
+crosstool_vsn='1.26.0'
 termcap_vsn='1.3.1'
 expat_vsn='2.5.0'
 zlib_vsn='1.2.13'
@@ -497,8 +497,6 @@ build_toolchain()
 		cd "$root_dir"
 		create_${arch}_config 'defconfig' "$libc"
 		ct-ng defconfig
-		sed -i -e "s|^CT_ZLIB_VERSION=.*|CT_ZLIB_VERSION=\"$zlib_vsn\"|" .config
-		sed -i -e 's|^CT_ZLIB_MIRRORS=.*|CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/ https://www.zlib.net/fossils/"|' .config
 		ct-ng build CT_PREFIX="$ct_prefix_dir" CT_JOBS="$ct_jobs"
 		rm -rf '.config' '.build' 'build.log'
 		cd "$OLDPWD"