[libcxx-commits] [libcxx] r358712 - [libc++] Link against libc++abi in the libc++abi tests

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Thu Apr 18 13:59:50 PDT 2019


Author: ldionne
Date: Thu Apr 18 13:59:49 2019
New Revision: 358712

URL: http://llvm.org/viewvc/llvm-project?rev=358712&view=rev
Log:
[libc++] Link against libc++abi in the libc++abi tests

PR27405

Modified:
    libcxx/trunk/utils/libcxx/test/config.py

Modified: libcxx/trunk/utils/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/config.py?rev=358712&r1=358711&r2=358712&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/config.py (original)
+++ libcxx/trunk/utils/libcxx/test/config.py Thu Apr 18 13:59:49 2019
@@ -818,7 +818,11 @@ class Configuration(object):
         elif cxx_abi == 'libsupc++':
             self.cxx.link_flags += ['-lsupc++']
         elif cxx_abi == 'libcxxabi':
-            if self.target_info.allow_cxxabi_link():
+            # If the C++ library requires explicitly linking to libc++abi, or
+            # if we're testing libc++abi itself (the test configs are shared),
+            # then link it.
+            testing_libcxxabi = self.get_lit_conf('name', '') == 'libc++abi'
+            if self.target_info.allow_cxxabi_link() or testing_libcxxabi:
                 libcxxabi_shared = self.get_lit_bool('libcxxabi_shared', default=True)
                 if libcxxabi_shared:
                     self.cxx.link_flags += ['-lc++abi']




More information about the libcxx-commits mailing list