Skip to content

Commit 9541e32

Browse files
bors[bot]Alexhuszagh
bors[bot]
and
Alexhuszagh
authored
Merge #1126
1126: Export and use `CROSS_TOOLCHAIN_PREFIX`. r=Emilgardis a=Alexhuszagh Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
2 parents 605caf1 + 2123935 commit 9541e32

File tree

65 files changed

+348
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+348
-350
lines changed

‎docker/Dockerfile.aarch64-linux-android‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN mkdir -p $PYTHON_TMPDIR
3232
COPY android $PYTHON_TMPDIR
3333
RUN /android-system.sh arm64
3434

35+
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-android-
3536
ENV CROSS_SYSROOT=/android-ndk/sysroot
3637
COPY android-symlink.sh /
3738
RUN /android-symlink.sh aarch64 aarch64-linux-android
@@ -40,21 +41,21 @@ COPY android-runner /
4041

4142
# Libz is distributed in the android ndk, but for some unknown reason it is not
4243
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
43-
ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
44+
ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
4445
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner aarch64" \
45-
AR_aarch64_linux_android=aarch64-linux-android-ar \
46-
AS_aarch64_linux_android=aarch64-linux-android-as \
47-
CC_aarch64_linux_android=aarch64-linux-android-gcc \
48-
CXX_aarch64_linux_android=aarch64-linux-android-g++ \
49-
LD_aarch64_linux_android=aarch64-linux-android-ld \
50-
NM_aarch64_linux_android=aarch64-linux-android-nm \
51-
OBJCOPY_aarch64_linux_android=aarch64-linux-android-objcopy \
52-
OBJDUMP_aarch64_linux_android=aarch64-linux-android-objdump \
53-
RANLIB_aarch64_linux_android=aarch64-linux-android-ranlib \
54-
READELF_aarch64_linux_android=aarch64-linux-android-readelf \
55-
SIZE_aarch64_linux_android=aarch64-linux-android-size \
56-
STRINGS_aarch64_linux_android=aarch64-linux-android-strings \
57-
STRIP_aarch64_linux_android=aarch64-linux-android-strip \
46+
AR_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"ar \
47+
AS_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"as \
48+
CC_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"gcc \
49+
CXX_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"g++ \
50+
LD_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"ld \
51+
NM_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"nm \
52+
OBJCOPY_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"objcopy \
53+
OBJDUMP_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"objdump \
54+
RANLIB_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"ranlib \
55+
READELF_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"readelf \
56+
SIZE_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"size \
57+
STRINGS_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"strings \
58+
STRIP_aarch64_linux_android="$CROSS_TOOLCHAIN_PREFIX"strip \
5859
BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android="--sysroot=$CROSS_SYSROOT" \
5960
DEP_Z_INCLUDE="$CROSS_SYSROOT/usr/include"/ \
6061
RUST_TEST_THREADS=1 \

‎docker/Dockerfile.aarch64-unknown-linux-gnu‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ RUN /linux-image.sh aarch64
3030

3131
COPY linux-runner base-runner.sh /
3232

33+
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-gnu-
3334
ENV CROSS_SYSROOT=/usr/aarch64-linux-gnu
34-
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
35+
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3536
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
36-
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
37-
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
37+
CC_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"gcc \
38+
CXX_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"g++ \
3839
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=$CROSS_SYSROOT" \
3940
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
4041
RUST_TEST_THREADS=1 \

‎docker/Dockerfile.aarch64-unknown-linux-gnu.centos‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ COPY linux-runner base-runner.sh /
3030
COPY aarch64-linux-gnu-glibc.sh /
3131
RUN /aarch64-linux-gnu-glibc.sh
3232

33+
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-gnu-
3334
ENV CROSS_SYSROOT=/usr/aarch64-linux-gnu
34-
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
35+
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3536
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
36-
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
37-
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
37+
CC_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"gcc \
38+
CXX_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"g++ \
3839
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=$CROSS_SYSROOT" \
3940
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
4041
RUST_TEST_THREADS=1

‎docker/Dockerfile.aarch64-unknown-linux-musl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN /qemu.sh aarch64
1616
COPY musl.sh /
1717
RUN /musl.sh TARGET=aarch64-linux-musl
1818

19+
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-musl-
1920
ENV CROSS_SYSROOT=/usr/local/aarch64-linux-musl
2021
COPY musl-symlink.sh /
2122
RUN /musl-symlink.sh $CROSS_SYSROOT aarch64
@@ -25,10 +26,10 @@ COPY rustc_info.sh /
2526

2627
COPY qemu-runner base-runner.sh /
2728

28-
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc.sh \
29+
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
2930
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="/qemu-runner aarch64" \
30-
CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
31-
CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++ \
31+
CC_aarch64_unknown_linux_musl="$CROSS_TOOLCHAIN_PREFIX"gcc \
32+
CXX_aarch64_unknown_linux_musl="$CROSS_TOOLCHAIN_PREFIX"g++ \
3233
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_musl="--sysroot=$CROSS_SYSROOT" \
3334
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3435
RUST_TEST_THREADS=1

‎docker/Dockerfile.arm-linux-androideabi‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN mkdir -p $PYTHON_TMPDIR
3232
COPY android $PYTHON_TMPDIR
3333
RUN /android-system.sh arm
3434

35+
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-androideabi-
3536
ENV CROSS_SYSROOT=/android-ndk/sysroot
3637
COPY android-symlink.sh /
3738
RUN /android-symlink.sh arm arm-linux-androideabi
@@ -40,21 +41,21 @@ COPY android-runner /
4041

4142
# Libz is distributed in the android ndk, but for some unknown reason it is not
4243
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
43-
ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
44+
ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
4445
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER="/android-runner arm" \
45-
AR_arm_linux_androideabi=arm-linux-androideabi-ar \
46-
AS_arm_linux_androideabi=arm-linux-androideabi-as \
47-
CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
48-
CXX_arm_linux_androideabi=arm-linux-androideabi-g++ \
49-
LD_arm_linux_androideabi=arm-linux-androideabi-ld \
50-
NM_arm_linux_androideabi=arm-linux-androideabi-nm \
51-
OBJCOPY_arm_linux_androideabi=arm-linux-androideabi-objcopy \
52-
OBJDUMP_arm_linux_androideabi=arm-linux-androideabi-objdump \
53-
RANLIB_arm_linux_androideabi=arm-linux-androideabi-ranlib \
54-
READELF_arm_linux_androideabi=arm-linux-androideabi-readelf \
55-
SIZE_arm_linux_androideabi=arm-linux-androideabi-size \
56-
STRINGS_arm_linux_androideabi=arm-linux-androideabi-strings \
57-
STRIP_arm_linux_androideabi=arm-linux-androideabi-strip \
46+
AR_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"ar \
47+
AS_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"as \
48+
CC_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
49+
CXX_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
50+
LD_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"ld \
51+
NM_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"nm \
52+
OBJCOPY_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"objcopy \
53+
OBJDUMP_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"objdump \
54+
RANLIB_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"ranlib \
55+
READELF_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"readelf \
56+
SIZE_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"size \
57+
STRINGS_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"strings \
58+
STRIP_arm_linux_androideabi="$CROSS_TOOLCHAIN_PREFIX"strip \
5859
BINDGEN_EXTRA_CLANG_ARGS_arm_linux_androideabi="--sysroot=$CROSS_SYSROOT" \
5960
DEP_Z_INCLUDE="$CROSS_SYSROOT/usr/include/" \
6061
RUST_TEST_THREADS=1 \

‎docker/Dockerfile.arm-unknown-linux-gnueabi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ RUN /qemu.sh arm
2424

2525
COPY qemu-runner base-runner.sh /
2626

27+
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
2728
ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
28-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
29+
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
2930
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER="/qemu-runner arm" \
30-
CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
31-
CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
31+
CC_arm_unknown_linux_gnueabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
32+
CXX_arm_unknown_linux_gnueabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
3233
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabi="--sysroot=$CROSS_SYSROOT" \
3334
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3435
RUST_TEST_THREADS=1 \

‎docker/Dockerfile.arm-unknown-linux-gnueabihf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ RUN /qemu.sh arm
2525

2626
COPY qemu-runner base-runner.sh /
2727

28+
ENV CROSS_TOOLCHAIN_PREFIX=arm-unknown-linux-gnueabihf-
2829
ENV CROSS_SYSROOT=/x-tools/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/
29-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc \
30+
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3031
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="/qemu-runner armhf" \
31-
CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
32-
CXX_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-g++ \
32+
CC_arm_unknown_linux_gnueabihf="$CROSS_TOOLCHAIN_PREFIX"gcc \
33+
CXX_arm_unknown_linux_gnueabihf="$CROSS_TOOLCHAIN_PREFIX"g++ \
3334
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabihf="--sysroot=$CROSS_SYSROOT" \
3435
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3536
RUST_TEST_THREADS=1

‎docker/Dockerfile.arm-unknown-linux-musleabi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ RUN /musl.sh \
2020
--with-float=soft \
2121
--with-mode=arm"
2222

23+
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2324
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2425
COPY musl-symlink.sh /
2526
RUN /musl-symlink.sh $CROSS_SYSROOT arm
2627

2728
COPY qemu-runner base-runner.sh /
2829

29-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_LINKER=arm-linux-musleabi-gcc \
30+
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3031
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_RUNNER="/qemu-runner arm" \
31-
CC_arm_unknown_linux_musleabi=arm-linux-musleabi-gcc \
32-
CXX_arm_unknown_linux_musleabi=arm-linux-musleabi-g++ \
32+
CC_arm_unknown_linux_musleabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
33+
CXX_arm_unknown_linux_musleabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
3334
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabi="--sysroot=$CROSS_SYSROOT" \
3435
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3536
RUST_TEST_THREADS=1

‎docker/Dockerfile.arm-unknown-linux-musleabihf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ RUN /musl.sh \
2121
--with-float=hard \
2222
--with-mode=arm"
2323

24+
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabihf-
2425
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
2526
COPY musl-symlink.sh /
2627
RUN /musl-symlink.sh $CROSS_SYSROOT armhf
2728

2829
COPY qemu-runner base-runner.sh /
2930

30-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-musleabihf-gcc \
31+
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3132
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="/qemu-runner armhf" \
32-
CC_arm_unknown_linux_musleabihf=arm-linux-musleabihf-gcc \
33-
CXX_arm_unknown_linux_musleabihf=arm-linux-musleabihf-g++ \
33+
CC_arm_unknown_linux_musleabihf="$CROSS_TOOLCHAIN_PREFIX"gcc \
34+
CXX_arm_unknown_linux_musleabihf="$CROSS_TOOLCHAIN_PREFIX"g++ \
3435
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabihf="--sysroot=$CROSS_SYSROOT" \
3536
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3637
RUST_TEST_THREADS=1

‎docker/Dockerfile.armv5te-unknown-linux-gnueabi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ RUN /qemu.sh arm
2525

2626
COPY qemu-runner base-runner.sh /
2727

28+
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
2829
ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
29-
ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
30+
ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
3031
CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_RUNNER="/qemu-runner arm" \
31-
CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
32-
CXX_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
32+
CC_armv5te_unknown_linux_gnueabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
33+
CXX_armv5te_unknown_linux_gnueabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
3334
BINDGEN_EXTRA_CLANG_ARGS_armv5te_unknown_linux_gnueabi="--sysroot=$CROSS_SYSROOT" \
3435
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3536
RUST_TEST_THREADS=1 \

0 commit comments

Comments
 (0)