Skip to content

Commit b592dd7

Browse files
committed
tests: Consistently use <triple>-gcc instead of <triple>-clang for cross compilation
While <triple>-clang is more specific, using <triple>-gcc allows testing GCC based toolchains (somewhat) with the same scripts/makefiles too.
1 parent 3844ad9 commit b592dd7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if ! $ANY_ARCH-w64-mingw32-gcc$TOOLEXT -E is-ucrt.c > /dev/null 2>&1; then
5858
fi
5959
rm -f is-ucrt.c
6060

61-
if (echo "int main(){}" | $ANY_ARCH-w64-mingw32-clang$TOOLEXT -x c++ - -o has-cfguard-test.exe -mguard=cf); then
61+
if (echo "int main(){}" | $ANY_ARCH-w64-mingw32-gcc$TOOLEXT -x c++ - -o has-cfguard-test.exe -mguard=cf); then
6262
if llvm-readobj$TOOLEXT --coff-load-config has-cfguard-test.exe | grep -q 'CF_INSTRUMENTED (0x100)'; then
6363
HAVE_CFGUARD=1
6464
elif [ -n "$HAVE_CFGUARD" ]; then

test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ ifneq ($(ARCH),)
3737
CROSS = $(ARCH)-w64-mingw32-
3838
CROSS_UWP = $(ARCH)-w64-mingw32uwp-
3939
endif
40-
CC = $(CROSS)clang$(TOOLEXT)
41-
CXX = $(CROSS)clang++$(TOOLEXT)
40+
CC = $(CROSS)gcc$(TOOLEXT)
41+
CXX = $(CROSS)g++$(TOOLEXT)
4242
WIDL = $(CROSS)widl$(TOOLEXT)
4343
CC_UWP = $(CROSS_UWP)clang$(TOOLEXT)
4444

0 commit comments

Comments
 (0)