From 448f7598721586888a67d55287133a65230b6935 Mon Sep 17 00:00:00 2001 From: Alex Huszagh Date: Tue, 1 Nov 2022 09:30:30 -0500 Subject: [PATCH] Explicitly prefer `-ar` to `-gcc-ar`. --- .changes/1105.json | 5 +++++ docker/Dockerfile.i686-unknown-freebsd | 1 + docker/Dockerfile.sparcv9-sun-solaris | 1 + docker/Dockerfile.thumbv6m-none-eabi | 3 +++ docker/Dockerfile.thumbv7em-none-eabi | 3 +++ docker/Dockerfile.thumbv7em-none-eabihf | 3 +++ docker/Dockerfile.thumbv7m-none-eabi | 3 +++ docker/Dockerfile.x86_64-sun-solaris | 1 + docker/Dockerfile.x86_64-unknown-dragonfly | 1 + docker/Dockerfile.x86_64-unknown-freebsd | 1 + docker/Dockerfile.x86_64-unknown-netbsd | 1 + 11 files changed, 23 insertions(+) create mode 100644 .changes/1105.json diff --git a/.changes/1105.json b/.changes/1105.json new file mode 100644 index 000000000..36ab770bb --- /dev/null +++ b/.changes/1105.json @@ -0,0 +1,5 @@ +{ + "type": "changed", + "description": "explicitly prefer `-ar` to `-gcc-ar`.", + "issues": [1100] +} diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd index f31c2de07..8aa7579c7 100644 --- a/docker/Dockerfile.i686-unknown-freebsd +++ b/docker/Dockerfile.i686-unknown-freebsd @@ -23,6 +23,7 @@ COPY i686-unknown-freebsd12-gcc.sh /usr/bin ENV CROSS_SYSROOT=/usr/local/i686-unknown-freebsd12 ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd12-gcc.sh \ + AR_i686_unknown_freebsd=i686-unknown-freebsd12-ar \ CC_i686_unknown_freebsd=i686-unknown-freebsd12-gcc \ CXX_i686_unknown_freebsd=i686-unknown-freebsd12-g++ \ BINDGEN_EXTRA_CLANG_ARGS_i686_unknown_freebsd="--sysroot=$CROSS_SYSROOT" \ diff --git a/docker/Dockerfile.sparcv9-sun-solaris b/docker/Dockerfile.sparcv9-sun-solaris index 1d12af2ec..e67eea2a2 100644 --- a/docker/Dockerfile.sparcv9-sun-solaris +++ b/docker/Dockerfile.sparcv9-sun-solaris @@ -15,6 +15,7 @@ RUN /solaris.sh sparcv9 ENV CROSS_SYSROOT=/usr/local/sparcv9-sun-solaris2.10 ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.10-gcc \ + AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-ar \ CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \ CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \ BINDGEN_EXTRA_CLANG_ARGS_sparcv9_sun_solaris="--sysroot=$CROSS_SYSROOT" diff --git a/docker/Dockerfile.thumbv6m-none-eabi b/docker/Dockerfile.thumbv6m-none-eabi index 1fab9f068..95a738c9e 100644 --- a/docker/Dockerfile.thumbv6m-none-eabi +++ b/docker/Dockerfile.thumbv6m-none-eabi @@ -17,4 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ /qemu.sh arm ENV QEMU_CPU=cortex-m3 \ + AR_thumbv6m_none_eabi=arm-none-eabi-ar \ + CC_thumbv6m_none_eabi=arm-none-eabi-gcc \ + CXX_thumbv6m_none_eabi=arm-none-eabi-g++ \ CARGO_TARGET_THUMBV6M_NONE_EABI_RUNNER=qemu-arm diff --git a/docker/Dockerfile.thumbv7em-none-eabi b/docker/Dockerfile.thumbv7em-none-eabi index 3ef13fcfe..4664c8d2d 100644 --- a/docker/Dockerfile.thumbv7em-none-eabi +++ b/docker/Dockerfile.thumbv7em-none-eabi @@ -17,4 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ /qemu.sh arm ENV QEMU_CPU=cortex-m4 \ + AR_thumbv7em_none_eabi=arm-none-eabi-ar \ + CC_thumbv7em_none_eabi=arm-none-eabi-gcc \ + CXX_thumbv7em_none_eabi=arm-none-eabi-g++ \ CARGO_TARGET_THUMBV7EM_NONE_EABI_RUNNER=qemu-arm diff --git a/docker/Dockerfile.thumbv7em-none-eabihf b/docker/Dockerfile.thumbv7em-none-eabihf index aa773e620..ed9f202ec 100644 --- a/docker/Dockerfile.thumbv7em-none-eabihf +++ b/docker/Dockerfile.thumbv7em-none-eabihf @@ -17,4 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ /qemu.sh arm ENV QEMU_CPU=cortex-m4 \ + AR_thumbv7em_none_eabihf=arm-none-eabi-ar \ + CC_thumbv7em_none_eabihf=arm-none-eabi-gcc \ + CXX_thumbv7em_none_eabihf=arm-none-eabi-g++ \ CARGO_TARGET_THUMBV7EM_NONE_EABIHF_RUNNER=qemu-arm diff --git a/docker/Dockerfile.thumbv7m-none-eabi b/docker/Dockerfile.thumbv7m-none-eabi index 4eed8f027..cbd469896 100644 --- a/docker/Dockerfile.thumbv7m-none-eabi +++ b/docker/Dockerfile.thumbv7m-none-eabi @@ -17,4 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ /qemu.sh arm ENV QEMU_CPU=cortex-m3 \ + AR_thumbv7m_none_eabi=arm-none-eabi-ar \ + CC_thumbv7m_none_eabi=arm-none-eabi-gcc \ + CXX_thumbv7m_none_eabi=arm-none-eabi-g++ \ CARGO_TARGET_THUMBV7M_NONE_EABI_RUNNER=qemu-arm diff --git a/docker/Dockerfile.x86_64-sun-solaris b/docker/Dockerfile.x86_64-sun-solaris index 3036331ae..a64acd522 100644 --- a/docker/Dockerfile.x86_64-sun-solaris +++ b/docker/Dockerfile.x86_64-sun-solaris @@ -15,6 +15,7 @@ RUN /solaris.sh x86_64 ENV CROSS_SYSROOT=/usr/local/x86_64-sun-solaris2.10 ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.10-gcc \ + AR_x86_64_sun_solaris=x86_64-sun-solaris2.10-ar \ CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \ CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++ \ BINDGEN_EXTRA_CLANG_ARGS_x86_64_sun_solaris="--sysroot=$CROSS_SYSROOT" diff --git a/docker/Dockerfile.x86_64-unknown-dragonfly b/docker/Dockerfile.x86_64-unknown-dragonfly index 605e753de..3f944e87b 100644 --- a/docker/Dockerfile.x86_64-unknown-dragonfly +++ b/docker/Dockerfile.x86_64-unknown-dragonfly @@ -15,6 +15,7 @@ RUN /dragonfly.sh 5 ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-dragonfly ENV CARGO_TARGET_X86_64_UNKNOWN_DRAGONFLY_LINKER=x86_64-unknown-dragonfly-gcc \ + AR_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-ar \ CC_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-gcc \ CXX_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-g++ \ BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_dragonfly="--sysroot=$CROSS_SYSROOT" diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd index 2c35f004b..44758a405 100644 --- a/docker/Dockerfile.x86_64-unknown-freebsd +++ b/docker/Dockerfile.x86_64-unknown-freebsd @@ -23,6 +23,7 @@ COPY x86_64-unknown-freebsd12-gcc.sh /usr/bin ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-freebsd12 ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd12-gcc.sh \ + AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-ar \ CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-gcc \ CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-g++ \ BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_freebsd="--sysroot=$CROSS_SYSROOT" \ diff --git a/docker/Dockerfile.x86_64-unknown-netbsd b/docker/Dockerfile.x86_64-unknown-netbsd index 4215d8647..e80d20ec3 100644 --- a/docker/Dockerfile.x86_64-unknown-netbsd +++ b/docker/Dockerfile.x86_64-unknown-netbsd @@ -15,6 +15,7 @@ RUN /netbsd.sh ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-netbsd ENV CARGO_TARGET_X86_64_UNKNOWN_NETBSD_LINKER=x86_64-unknown-netbsd-gcc \ + AR_x86_64_unknown_netbsd=x86_64-unknown-netbsd-ar \ CC_x86_64_unknown_netbsd=x86_64-unknown-netbsd-gcc \ CXX_x86_64_unknown_netbsd=x86_64-unknown-netbsd-g++ \ BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_netbsd="--sysroot=$CROSS_SYSROOT"