summaryrefslogtreecommitdiff
path: root/libcxxabi
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2023-03-30 14:40:17 +0300
committerMartin Storsjö <martin@martin.st>2023-04-19 13:36:05 +0300
commit637d572f7b5029504661860d20ab309427eb6090 (patch)
tree18d97c5cc1ac37e4063fae804b95505929280be2 /libcxxabi
parentf3ee6695e0f6232fee96e2e6ccd96e85ed682998 (diff)
downloadllvm-637d572f7b5029504661860d20ab309427eb6090.tar.gz
[libcxxabi] [test] Fix the mingw test config
Don't link libc++abi separately in addition to the main -lc++; in mingw build configs, libc++abi is always bundled into libc++ (via LIBCXX_ENABLE_STATIC_ABI_LIBRARY). In the case of a shared linked libc++, linking a separate static libc++abi leads to linker errors. Differential Revision: https://reviews.llvm.org/D147638
Diffstat (limited to 'libcxxabi')
-rw-r--r--libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in b/libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in
index 5e1a5dc70470..6f88304fb0c5 100644
--- a/libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in
+++ b/libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in
@@ -8,7 +8,7 @@ config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS'
))
config.substitutions.append(('%{link_flags}',
- '-nostdlib++ -L %{lib} -lc++ -lc++abi'
+ '-nostdlib++ -L %{lib} -lc++'
))
config.substitutions.append(('%{exec}',
'%{executor} --execdir %T --env PATH=%{lib} -- '