From: Rémi Bernon <rbernon@codeweavers.com> Instead of assuming the C compiler can compile C++. --- configure.ac | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 89243b45be0..65a6bbfcaf7 100644 --- a/configure.ac +++ b/configure.ac @@ -94,9 +94,9 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST AC_SUBST(srcdir) -AS_IF([test "x$enable_sast" = xyes],[CC=${CC:-clang} -with_mingw=${with_mingw:-clang} -AC_CHECK_PROGS(SARIF_CONVERTER,sarif-converter,false)]) +AS_IF([test "x$enable_sast" = xyes],[CC=${CC:-clang}; CXX=${CXX:-clang++} + with_mingw=${with_mingw:-clang} + AC_CHECK_PROGS(SARIF_CONVERTER,sarif-converter,false)]) dnl **** Check for some programs **** @@ -419,27 +419,36 @@ do *) mingw_cpu=$wine_arch ;; esac case "x$with_mingw" in - xclang|x*/clang) AS_VAR_SET(${wine_arch}_CC,$with_mingw) ;; - xllvm-mingw) AS_VAR_SET(${wine_arch}_CC,${mingw_cpu}-w64-mingw32-clang) ;; + xclang|x*/clang) AS_VAR_SET(${wine_arch}_CC,$with_mingw) + AS_VAR_SET(${wine_arch}_CXX,${with_mingw}++) ;; + xllvm-mingw) AS_VAR_SET(${wine_arch}_CC,${mingw_cpu}-w64-mingw32-clang) + AS_VAR_SET(${wine_arch}_CXX,${mingw_cpu}-w64-mingw32-clang++) ;; esac AS_VAR_IF([${wine_arch}_CC],[], [case $wine_arch in aarch64) AC_CHECK_PROGS(aarch64_CC,[aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang],[false]) + AC_CHECK_PROGS(aarch64_CXX,[aarch64-w64-mingw32-clang++ aarch64-w64-mingw32-g++ clang++],[false]) ;; arm64ec) AC_CHECK_PROGS(arm64ec_CC,[arm64ec-w64-mingw32-clang arm64ec-w64-mingw32-gcc clang],[false]) + AC_CHECK_PROGS(arm64ec_CXX,[arm64ec-w64-mingw32-clang++ arm64ec-w64-mingw32-g++ clang++],[false]) ;; arm) AC_CHECK_PROGS(arm_CC,[armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang],[false]) + AC_CHECK_PROGS(arm_CXX,[armv7-w64-mingw32-clang++ armv7-w64-mingw32-g++ clang++],[false]) ;; i386) ac_prefix_list="m4_foreach([cc],[gcc,clang],m4_foreach([cpu],[i686,i586,i486,i386],[cpu-w64-mingw32-cc ]))" AC_CHECK_PROGS(i386_CC,[$ac_prefix_list clang],[false]) + ac_prefix_list="m4_foreach([cc],[g++,clang++],m4_foreach([cpu],[i686,i586,i486,i386],[cpu-w64-mingw32-cc ]))" + AC_CHECK_PROGS(i386_CXX,[$ac_prefix_list clang++],[false]) ;; x86_64) ac_prefix_list="m4_foreach([cc],[gcc,clang],m4_foreach([cpu],[x86_64,amd64],[cpu-w64-mingw32-cc ]))" AC_CHECK_PROGS(x86_64_CC,[$ac_prefix_list clang],[false]) + ac_prefix_list="m4_foreach([cc],[g++,clang++],m4_foreach([cpu],[x86_64,amd64],[cpu-w64-mingw32-cc ]))" + AC_CHECK_PROGS(x86_64_CXX,[$ac_prefix_list clang++],[false]) ;; esac wine_try_msvc=yes], -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10399