@@ -13,6 +13,7 @@ echo "Testing Rust ${RUST} on ${OS}"
13
13
test_target () {
14
14
CARGO=" ${1} "
15
15
TARGET=" ${2} "
16
+ NO_STD=" ${3} "
16
17
17
18
opt=
18
19
if [ " ${TARGET} " = " x86_64-unknown-linux-gnux32" ]; then
@@ -23,14 +24,10 @@ test_target() {
23
24
opt=" --release"
24
25
fi
25
26
26
- NO_STD=" ${3} "
27
- case ${TARGET} in
28
- thumbv* )
29
- NO_STD=1
30
- ;;
31
- esac
32
-
33
- rustup target add " ${TARGET} " --toolchain " ${RUST} "
27
+ # If there is a std component, fetch it:
28
+ if [ " ${NO_STD} " != " 1" ]; then
29
+ rustup target add " ${TARGET} " --toolchain " ${RUST} "
30
+ fi
34
31
35
32
# Test that libc builds without any default features (no libstd)
36
33
" $CARGO " " +${RUST} " build -vv $opt --no-default-features --target " ${TARGET} "
@@ -106,12 +103,6 @@ RUST_NIGHTLY_LINUX_TARGETS="\
106
103
aarch64-fuchsia \
107
104
armv5te-unknown-linux-gnueabi \
108
105
armv5te-unknown-linux-musleabi \
109
- thumbv6m-none-eabi \
110
- thumbv7em-none-eabi \
111
- thumbv7em-none-eabihf \
112
- thumbv7m-none-eabi \
113
- thumbv7neon-linux-androideabi \
114
- thumbv7neon-unknown-linux-gnueabihf \
115
106
x86_64-fortanix-unknown-sgx \
116
107
x86_64-fuchsia \
117
108
x86_64-unknown-linux-gnux32 \
@@ -189,6 +180,12 @@ powerpc-unknown-linux-gnuspe \
189
180
riscv32imac-unknown-none-elf \
190
181
riscv32imc-unknown-none-elf \
191
182
sparc64-unknown-netbsd \
183
+ thumbv6m-none-eabi \
184
+ thumbv7em-none-eabi \
185
+ thumbv7em-none-eabihf \
186
+ thumbv7m-none-eabi \
187
+ thumbv7neon-linux-androideabi \
188
+ thumbv7neon-unknown-linux-gnueabihf \
192
189
thumbv8m.main-none-eabi \
193
190
x86_64-pc-windows-gnu \
194
191
x86_64-pc-windows-msvc
@@ -199,6 +196,6 @@ x86_64-unknown-openbsd
199
196
200
197
if [ " ${RUST} " = " nightly" ] && [ " ${OS} " = " linux" ]; then
201
198
for TARGET in $RUST_LINUX_NO_CORE_TARGETS ; do
202
- RUST_LIBC_NO_CORE_BUILD=1 test_target xargo " $TARGET " 1
199
+ test_target xargo " $TARGET " 1
203
200
done
204
201
fi
0 commit comments