diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-07-15 17:53:00 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-07-16 13:26:17 -0400 |
| commit | 097759f9f85ded496b21cf28e83cbdad1bf9a65b (patch) | |
| tree | 276318c862e25a2d464819bf4a3cc027c94f3e7c | |
| parent | fa0927454b02e4439d1683c2c3a3edd5b251dba1 (diff) | |
| download | haskell-097759f9f85ded496b21cf28e83cbdad1bf9a65b.tar.gz | |
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.
| -rw-r--r-- | m4/fp_setup_windows_toolchain.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
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" |