diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-07-15 17:53:00 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-07-16 00:41:03 -0400 |
| commit | 96559c8bcb3540327bd34d8e94b9f521d69588d2 (patch) | |
| tree | a6dabc3775657d397840f5195c0e0b77236cbe8b | |
| parent | 41714736b33c36b8386735cc83b40eae65fa4149 (diff) | |
| download | haskell-96559c8bcb3540327bd34d8e94b9f521d69588d2.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.
(cherry picked from commit 582bde433879042a42ad8a1862b1c46d6832b00b)
| -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 5fdac70113..e1a2244c37 100644 --- a/m4/fp_setup_windows_toolchain.m4 +++ b/m4/fp_setup_windows_toolchain.m4 @@ -87,7 +87,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" |