[libcxx-commits] [libcxxabi] 637d572 - [libcxxabi] [test] Fix the mingw test config

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2023-04-19T13:36:05+03:00
New Revision: 637d572f7b5029504661860d20ab309427eb6090

URL: https://github.com/llvm/llvm-project/commit/637d572f7b5029504661860d20ab309427eb6090
DIFF: https://github.com/llvm/llvm-project/commit/637d572f7b5029504661860d20ab309427eb6090.diff

LOG: [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

Added: 
    

Modified: 
    libcxxabi/test/configs/llvm-libc++abi-mingw.cfg.in

Removed: 
    


################################################################################
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} -- '