diff options
| author | Josh Stone <jistone@redhat.com> | 2023-04-25 12:42:22 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2023-04-26 13:42:10 -0700 |
| commit | d7d67d83fffea8944e86f8e6ae9493f54df69d65 (patch) | |
| tree | bd9288f66785c2d2d6c62ca20caafd645c8e8fcc /src/ci/docker/scripts | |
| parent | 9c044d77a334609513f3b615e0763a40cc02424d (diff) | |
| download | rust-d7d67d83fffea8944e86f8e6ae9493f54df69d65.tar.gz rust-d7d67d83fffea8944e86f8e6ae9493f54df69d65.zip | |
ci: upgrade to crosstool-ng 1.25.0
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/crosstool-ng-1.24.sh | 13 | ||||
| -rw-r--r-- | src/ci/docker/scripts/crosstool-ng.sh | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/ci/docker/scripts/crosstool-ng-1.24.sh b/src/ci/docker/scripts/crosstool-ng-1.24.sh deleted file mode 100644 index 3a40f6cddb3..00000000000 --- a/src/ci/docker/scripts/crosstool-ng-1.24.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -ex - -# Mirrored from https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.24.0.tar.gz -url="https://ci-mirrors.rust-lang.org/rustc/crosstool-ng-1.24.0.tar.gz" -curl -Lf $url | tar xzf - -cd crosstool-ng-crosstool-ng-1.24.0 -./bootstrap -./configure --prefix=/usr/local -make -j$(nproc) -make install -cd .. -rm -rf crosstool-ng-crosstool-ng-1.24.0 diff --git a/src/ci/docker/scripts/crosstool-ng.sh b/src/ci/docker/scripts/crosstool-ng.sh index 1d0c28c8e58..a28d7bde2ac 100644 --- a/src/ci/docker/scripts/crosstool-ng.sh +++ b/src/ci/docker/scripts/crosstool-ng.sh @@ -1,12 +1,19 @@ #!/bin/sh set -ex -url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.22.0.tar.gz" +CT_NG=1.25.0 + +url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-$CT_NG.tar.gz" curl -Lf $url | tar xzf - -cd crosstool-ng-crosstool-ng-1.22.0 +cd crosstool-ng-crosstool-ng-$CT_NG + +# https://github.com/crosstool-ng/crosstool-ng/issues/1832 +# "download source of zlib is invalid now" +sed -e "s|zlib.net/'|zlib.net/fossils'|" -i packages/zlib/package.desc + ./bootstrap ./configure --prefix=/usr/local make -j$(nproc) make install cd .. -rm -rf crosstool-ng-crosstool-ng-1.22.0 +rm -rf crosstool-ng-crosstool-ng-$CT_NG |