From 097759f9f85ded496b21cf28e83cbdad1bf9a65b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 15 Jul 2022 17:53:00 -0400 Subject: configure: Don't override Windows CXXFLAGS At some point we used the clang distribution from msys2's `MINGW64` environment for our Windows toolchain. This defaulted to using libgcc and libstdc++ for its runtime library. However, we found for a variety of reasons that compiler-rt, libunwind, and libc++ were more reliable, consequently we explicitly overrode the CXXFLAGS to use these. However, since then we have switched to use the `CLANG64` packaging, which default to these already. Consequently we can drop these arguments, silencing some redundant argument warnings from clang. Fixes #21669. --- m4/fp_setup_windows_toolchain.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/fp_setup_windows_toolchain.m4 b/m4/fp_setup_windows_toolchain.m4 index 79a6ac6531..15b85b2bb2 100644 --- a/m4/fp_setup_windows_toolchain.m4 +++ b/m4/fp_setup_windows_toolchain.m4 @@ -86,7 +86,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[ CONF_CC_OPTS_STAGE1="$cflags" CONF_CC_OPTS_STAGE2="$cflags" - cxxflags="--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" + cxxflags="" CXXFLAGS="$cxxflags" CONF_CXX_OPTS_STAGE1="$cxxflags" CONF_CXX_OPTS_STAGE2="$cxxflags" -- cgit v1.2.1