diff --git a/test/compilable/issue15574.sh b/test/compilable/issue15574.sh index 7542e2e24547..8985732d2f39 100644 --- a/test/compilable/issue15574.sh +++ b/test/compilable/issue15574.sh @@ -1,9 +1,7 @@ #! /usr/bin/env bash - if [[ $OS = *"win"* ]]; then exit 0; fi - if [ $LIBEXT = ".a" ]; then LIB_PREFIX=lib else @@ -46,9 +44,7 @@ int main() { } EOF -if [ -z ${CC+x} ]; then CC=cc; fi - -$CC -m${MODEL} -c -o ${C_FILE}${OBJ} $C_FILE +cc -m${MODEL} -c -o ${C_FILE}${OBJ} $C_FILE ar rcs ${C_LIB} ${C_FILE}${OBJ} ${DMD} -m${MODEL} -lib -of${D_LIB} ${D_FILE} diff --git a/test/tools/exported_vars.sh b/test/tools/exported_vars.sh index 4f097e92d090..22f464612238 100644 --- a/test/tools/exported_vars.sh +++ b/test/tools/exported_vars.sh @@ -12,3 +12,9 @@ if [ "$OS" == "win32" ] || [ "$OS" == "win64" ]; then else export LIBEXT=.a fi + +# Default to DigitalMars C++ on Win32 +if [ "$OS" == "win32" ] && [ -z "${CC+set}" ] ; then + CC="dmc" +fi +export CC="${CC:-c++}" # C++ compiler to use