Skip to content

Commit ac7fbe8

Browse files
bors[bot]Alexhuszagh
bors[bot]
and
Alexhuszagh
authored
Merge #1080
1080: Add `CROSS_SYSROOT` envvar to specify target sysroot. r=Emilgardis a=Alexhuszagh Closes #1079. Co-authored-by: Alex Huszagh <[email protected]>
2 parents 79eeb91 + ffc83fe commit ac7fbe8

File tree

54 files changed

+175
-135
lines changed

Some content is hidden

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

54 files changed

+175
-135
lines changed

‎docker/Dockerfile.aarch64-linux-android‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ RUN /android-system.sh arm64
2020
COPY qemu.sh /
2121
RUN /qemu.sh aarch64
2222

23-
RUN cp /android-ndk/sysroot/usr/lib/aarch64-linux-android/28/libz.so /system/lib/
23+
ENV CROSS_SYSROOT=/android-ndk/sysroot
24+
RUN cp $CROSS_SYSROOT/usr/lib/aarch64-linux-android/28/libz.so /system/lib/
2425

2526
COPY android-runner /
2627

@@ -30,8 +31,8 @@ ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
3031
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner aarch64" \
3132
CC_aarch64_linux_android=aarch64-linux-android-gcc \
3233
CXX_aarch64_linux_android=aarch64-linux-android-g++ \
33-
BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android="--sysroot=/android-ndk/sysroot" \
34-
DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
34+
BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android="--sysroot=$CROSS_SYSROOTt" \
35+
DEP_Z_INCLUDE="$CROSS_SYSROOT/usr/include"/ \
3536
RUST_TEST_THREADS=1 \
3637
HOME=/tmp/ \
3738
TMPDIR=/tmp/ \

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

Lines changed: 3 additions & 2 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_SYSROOT=/usr/aarch64-linux-gnu
3334
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
3435
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
3536
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
3637
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
37-
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu" \
38-
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
38+
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=$CROSS_SYSROOT" \
39+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3940
RUST_TEST_THREADS=1 \
4041
PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"

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

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

33-
33+
ENV CROSS_SYSROOT=/usr/aarch64-linux-gnu
3434
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
3535
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
3636
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
3737
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
38-
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu" \
39-
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
38+
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=$CROSS_SYSROOT" \
39+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
4040
RUST_TEST_THREADS=1

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

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

19-
ENV CROSS_MUSL_SYSROOT=/usr/local/aarch64-linux-musl
19+
ENV CROSS_SYSROOT=/usr/local/aarch64-linux-musl
2020
COPY musl-symlink.sh /
21-
RUN /musl-symlink.sh $CROSS_MUSL_SYSROOT aarch64
21+
RUN /musl-symlink.sh $CROSS_SYSROOT aarch64
2222

2323
COPY aarch64-linux-musl-gcc.sh /usr/bin/
2424
COPY rustc_info.sh /
@@ -29,6 +29,6 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc.sh \
2929
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="/qemu-runner aarch64" \
3030
CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
3131
CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++ \
32-
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_musl="--sysroot=$CROSS_MUSL_SYSROOT" \
33-
QEMU_LD_PREFIX=$CROSS_MUSL_SYSROOT \
32+
BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_musl="--sysroot=$CROSS_SYSROOT" \
33+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3434
RUST_TEST_THREADS=1

‎docker/Dockerfile.arm-linux-androideabi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ RUN /android-system.sh arm
2020
COPY qemu.sh /
2121
RUN /qemu.sh arm
2222

23-
RUN cp /android-ndk/sysroot/usr/lib/arm-linux-androideabi/28/libz.so /system/lib/
23+
ENV CROSS_SYSROOT=/android-ndk/sysroot
24+
RUN cp $CROSS_SYSROOT/usr/lib/arm-linux-androideabi/28/libz.so /system/lib/
2425

2526
COPY android-runner /
2627

@@ -30,8 +31,8 @@ ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
3031
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER="/android-runner arm" \
3132
CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
3233
CXX_arm_linux_androideabi=arm-linux-androideabi-g++ \
33-
BINDGEN_EXTRA_CLANG_ARGS_arm_linux_androideabi="--sysroot=/android-ndk/sysroot" \
34-
DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
34+
BINDGEN_EXTRA_CLANG_ARGS_arm_linux_androideabi="--sysroot=$CROSS_SYSROOT" \
35+
DEP_Z_INCLUDE="$CROSS_SYSROOT/usr/include/" \
3536
RUST_TEST_THREADS=1 \
3637
HOME=/tmp/ \
3738
TMPDIR=/tmp/ \

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

Lines changed: 3 additions & 2 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_SYSROOT=/usr/arm-linux-gnueabi
2728
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
2829
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER="/qemu-runner arm" \
2930
CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
3031
CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
31-
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabi="--sysroot=/usr/arm-linux-gnueabi" \
32-
QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \
32+
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabi="--sysroot=$CROSS_SYSROOT" \
33+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3334
RUST_TEST_THREADS=1 \
3435
PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabi/pkgconfig/:${PKG_CONFIG_PATH}"

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

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

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

28+
ENV CROSS_SYSROOT=/x-tools/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/
2829
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc \
2930
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="/qemu-runner armhf" \
3031
CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
3132
CXX_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-g++ \
32-
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabihf="--sysroot=/x-tools/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/" \
33-
QEMU_LD_PREFIX=/x-tools/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/ \
33+
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabihf="--sysroot=$CROSS_SYSROOT" \
34+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3435
RUST_TEST_THREADS=1

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

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

23-
ENV CROSS_MUSL_SYSROOT=/usr/local/arm-linux-musleabi
23+
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2424
COPY musl-symlink.sh /
25-
RUN /musl-symlink.sh $CROSS_MUSL_SYSROOT arm
25+
RUN /musl-symlink.sh $CROSS_SYSROOT arm
2626

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

2929
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_LINKER=arm-linux-musleabi-gcc \
3030
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_RUNNER="/qemu-runner arm" \
3131
CC_arm_unknown_linux_musleabi=arm-linux-musleabi-gcc \
3232
CXX_arm_unknown_linux_musleabi=arm-linux-musleabi-g++ \
33-
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabi="--sysroot=$CROSS_MUSL_SYSROOT" \
34-
QEMU_LD_PREFIX=$CROSS_MUSL_SYSROOT \
33+
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabi="--sysroot=$CROSS_SYSROOT" \
34+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3535
RUST_TEST_THREADS=1

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

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

24-
ENV CROSS_MUSL_SYSROOT=/usr/local/arm-linux-musleabihf
24+
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
2525
COPY musl-symlink.sh /
26-
RUN /musl-symlink.sh $CROSS_MUSL_SYSROOT armhf
26+
RUN /musl-symlink.sh $CROSS_SYSROOT armhf
2727

2828
COPY qemu-runner base-runner.sh /
2929

3030
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-musleabihf-gcc \
3131
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="/qemu-runner armhf" \
3232
CC_arm_unknown_linux_musleabihf=arm-linux-musleabihf-gcc \
3333
CXX_arm_unknown_linux_musleabihf=arm-linux-musleabihf-g++ \
34-
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabihf="--sysroot=$CROSS_MUSL_SYSROOT" \
35-
QEMU_LD_PREFIX=$CROSS_MUSL_SYSROOT \
34+
BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_musleabihf="--sysroot=$CROSS_SYSROOT" \
35+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3636
RUST_TEST_THREADS=1

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

Lines changed: 3 additions & 2 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_SYSROOT=/usr/arm-linux-gnueabi
2829
ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
2930
CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_RUNNER="/qemu-runner arm" \
3031
CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
3132
CXX_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
32-
BINDGEN_EXTRA_CLANG_ARGS_armv5te_unknown_linux_gnueabi="--sysroot=/usr/arm-linux-gnueabi" \
33-
QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \
33+
BINDGEN_EXTRA_CLANG_ARGS_armv5te_unknown_linux_gnueabi="--sysroot=$CROSS_SYSROOT" \
34+
QEMU_LD_PREFIX="$CROSS_SYSROOT" \
3435
RUST_TEST_THREADS=1 \
3536
PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabi/pkgconfig/:${PKG_CONFIG_PATH}"

0 commit comments

Comments
 (0)