Skip to content

Commit e058ea2

Browse files
committed
More consistent toolchains in all.sh
1 parent cde2aba commit e058ea2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/scripts/all.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
206206
scripts/config.pl unset MBEDTLS_THREADING_C
207207
scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
208208
scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
209-
CC=arm-none-eabi-gcc CFLAGS=-Werror make lib
209+
CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS=-Werror make lib
210210
fi # arm-gcc
211211

212212
if which armcc >/dev/null && armcc --help >/dev/null; then
@@ -237,7 +237,7 @@ fi # armcc
237237
if which i686-w64-mingw32-gcc >/dev/null; then
238238
msg "build: cross-mingw64, make" # ~ 30s
239239
cleanup
240-
CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS=-Werror WINDOWS_BUILD=1 make
240+
CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=-Werror WINDOWS_BUILD=1 make
241241
WINDOWS_BUILD=1 make clean
242242
fi
243243

0 commit comments

Comments
 (0)