Skip to content

Commit

Permalink
Update rust-lang/rust links
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jan 22, 2025
1 parent 3819bd8 commit 38749ec
Show file tree
Hide file tree
Showing 21 changed files with 67 additions and 65 deletions.
5 changes: 3 additions & 2 deletions docker/android.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
# - https://developer.android.com/ndk
# - https://android.googlesource.com/platform/ndk/+/refs/heads/ndk-r15-release/docs/user/standalone_toolchain.md
# - https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/host-x86_64/dist-android/Dockerfile
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/android-ndk.sh
# - https://github.com/rust-lang/rust/blob/1.81.0/src/ci/docker/host-x86_64/dist-android/Dockerfile
# TODO: updated in Rust 1.82 https://github.com/rust-lang/rust/commit/8bf9aeaa80fcb9d30fa2dfab85f323d38ea9c6f2
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/android-ndk.sh

ARG RUST_TARGET
ARG UBUNTU_VERSION=20.04
Expand Down
4 changes: 2 additions & 2 deletions docker/base/illumos.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/illumos-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/illumos-toolchain.sh
# - https://github.com/illumos/sysroot

# https://github.com/illumos/sysroot/releases
Expand All @@ -11,7 +11,7 @@ ARG SYSROOT_VERSION=20181213-de6af22ae73b-v1
# didn't against when gcc9 obsoleted solaris10. So using solaris11 here is
# probably ok, but for now, use the same as rust-lang/rust.
# https://gcc.gnu.org/legacy-ml/gcc/2018-10/msg00139.html
# https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/illumos-toolchain.sh#L21
# https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/illumos-toolchain.sh#L21
ARG SOLARIS_VERSION=2.10
# https://ftp.gnu.org/gnu/binutils
ARG BINUTILS_VERSION=2.40
Expand Down
2 changes: 1 addition & 1 deletion docker/base/linux-musl-hexagon.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# musl-cross-make doesn't support this target
#
# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md
# - https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md
# - https://github.com/qemu/qemu/blob/v9.2.0/tests/docker/dockerfiles/debian-hexagon-cross.docker

FROM ghcr.io/taiki-e/build-base:alpine AS builder
Expand Down
6 changes: 3 additions & 3 deletions docker/base/linux-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Refs:
# - https://github.com/richfelker/musl-cross-make
# - https://musl.cc
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/musl-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/musl-toolchain.sh

# TODO: enable debuginfo https://github.com/rust-lang/rust/pull/90733
# TODO: https://github.com/rust-lang/rust/pull/130471
Expand Down Expand Up @@ -38,8 +38,8 @@ case "${RUST_TARGET}" in
arm*hf | thumb*hf) cc_target=arm-linux-musleabihf ;;
arm* | thumb*) cc_target=arm-linux-musleabi ;;
hexagon-*) cc_target="${RUST_TARGET}" ;;
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
mips-*) cc_target=mips-linux-muslsf ;;
mipsel-*) cc_target=mipsel-linux-muslsf ;;
riscv??gc-*) cc_target="${RUST_TARGET/gc-unknown/}" ;;
Expand Down
2 changes: 1 addition & 1 deletion docker/base/netbsd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh

# When using clang:
# - aarch64, i686, and x86_64 work without gnu binutils.
Expand Down
2 changes: 1 addition & 1 deletion docker/base/solaris.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh

ARG UBUNTU_VERSION=20.04

Expand Down
2 changes: 1 addition & 1 deletion docker/build-libunwind/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT

// Adapted from https://github.com/rust-lang/rust/blob/1.80.0/src/bootstrap/src/core/build_steps/llvm.rs#L1258-L1413.
// Adapted from https://github.com/rust-lang/rust/blob/1.84.0/src/bootstrap/src/core/build_steps/llvm.rs#L1370-L1511.

use std::{env, ffi::OsStr, path::PathBuf, process::Command};

Expand Down
12 changes: 6 additions & 6 deletions docker/clang-cross.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ common_flags_last=''
case "${RUST_TARGET}" in
# The --target option is last because the cross-build of LLVM uses
# --target without an OS version.
# https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/freebsd-toolchain.sh#L70-L75
# https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/freebsd-toolchain.sh#L70-L75
*-freebsd* | *-openbsd*) common_flags_last+=" --target=${cc_target}" ;;
*) common_flags+=" --target=${cc_target}" ;;
esac
Expand All @@ -35,16 +35,16 @@ case "${RUST_TARGET}" in
armv7-*hf) common_flags+=" -march=armv7-a -marm -mfpu=vfpv3-d16 -mfloat-abi=hard" ;;
armv7-*) common_flags+=" -march=armv7-a -marm -mfloat-abi=softfp" ;;
# builtin armeb-unknown-linux-gnueabi is v8
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/armeb_unknown_linux_gnueabi.rs#L18
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/armeb_unknown_linux_gnueabi.rs#L18
armeb-*hf) common_flags+=" -march=armv8-a -marm -mfloat-abi=hard -mstrict-align" ;; # TODO: -mfpu?
armeb-*) common_flags+=" -march=armv8-a -marm -mfloat-abi=soft -mstrict-align" ;;
mips-* | mipsel-*)
common_flags+=" -march=mips32r2"
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
# TODO(linux-uclibc): Rust targets are soft-float, but toolchain is hard-float.
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_uclibc.rs#L19
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_uclibc.rs#L18
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_uclibc.rs#L19
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_uclibc.rs#L18
case "${RUST_TARGET}" in
*-linux-musl*) common_flags+=" -mfloat-abi=soft" ;;
esac
Expand Down
2 changes: 1 addition & 1 deletion docker/emscripten.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ARG UBUNTU_VERSION=20.04

# https://github.com/rust-lang/rust/blob/3a85d3fa785d95a7b7bcf4f160b67bffba7afd4a/src/ci/docker/scripts/emscripten.sh
# https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/emscripten.sh
# NB: When updating this, the reminder to update emscripten version in README.md.
ARG EMSCRIPTEN_VERSION=3.1.68
ARG HOST_SUFFIX=''
Expand Down
2 changes: 1 addition & 1 deletion docker/freebsd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/freebsd-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/freebsd-toolchain.sh

ARG UBUNTU_VERSION=20.04

Expand Down
2 changes: 1 addition & 1 deletion docker/linux-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ case "${RUST_TARGET}" in
exit 0
;;
csky-unknown-linux-gnuabiv2*)
# https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/csky-unknown-linux-gnuabiv2.md
# https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/csky-unknown-linux-gnuabiv2.md
toolchain_source_id=1356021/1619528643136
toolchain_date=20210423
qemu_source_id=1689324918932
Expand Down
6 changes: 3 additions & 3 deletions docker/linux-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Refs:
# - https://github.com/richfelker/musl-cross-make
# - https://musl.cc
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/scripts/musl-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/scripts/musl-toolchain.sh

ARG RUST_TARGET
ARG UBUNTU_VERSION=20.04
Expand Down Expand Up @@ -42,8 +42,8 @@ case "${RUST_TARGET}" in
arm*hf | thumb*hf) cc_target=arm-linux-musleabihf ;;
arm* | thumb*) cc_target=arm-linux-musleabi ;;
hexagon-*) cc_target="${RUST_TARGET}" ;;
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.80.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs#L7
# https://github.com/rust-lang/rust/blob/1.84.0/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs#L6
mips-*) cc_target=mips-linux-muslsf ;;
mipsel-*) cc_target=mipsel-linux-muslsf ;;
riscv??gc-*) cc_target="${RUST_TARGET/gc-unknown/}" ;;
Expand Down
4 changes: 2 additions & 2 deletions docker/linux-uclibc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

# Refs:
# - https://www.uclibc-ng.org
# - https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md
# - https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md
# - https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md
# - https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md

ARG UBUNTU_VERSION=20.04

Expand Down
4 changes: 2 additions & 2 deletions docker/netbsd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/netbsd.md
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/netbsd.md
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh

# When using clang:
# - aarch64, i686, and x86_64 work without gnu binutils.
Expand Down
2 changes: 1 addition & 1 deletion docker/openbsd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/doc/rustc/src/platform-support/openbsd.md
# - https://github.com/rust-lang/rust/blob/1.84.0/src/doc/rustc/src/platform-support/openbsd.md

ARG UBUNTU_VERSION=20.04

Expand Down
2 changes: 1 addition & 1 deletion docker/redox.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

# Refs:
# - https://github.com/rust-lang/rust/blob/1.80.0/src/ci/docker/host-x86_64/dist-various-1/install-x86_64-redox.sh
# - https://github.com/rust-lang/rust/blob/1.84.0/src/ci/docker/host-x86_64/dist-various-1/install-x86_64-redox.sh

ARG UBUNTU_VERSION=22.04

Expand Down
Loading

0 comments on commit 38749ec

Please sign in to comment.