[PATCH] D56701: [libc++] Support compiler-rt builtins library in tests

[Petr Hosek via Phabricator]

phosek created this revision.
phosek added reviewers: EricWF, ldionne, mclow.lists.
Herald added subscribers: libcxx-commits, christof, dberris.
Herald added a reviewer: serge-sans-paille.

When building with compiler-rt, link builtins library to tests.


Repository:
  rCXX libc++

https://reviews.llvm.org/D56701

Files:
  libcxx/test/lit.site.cfg.in
  libcxx/utils/libcxx/test/target_info.py


Index: libcxx/utils/libcxx/test/target_info.py
===================================================================
--- libcxx/utils/libcxx/test/target_info.py
+++ libcxx/utils/libcxx/test/target_info.py
@@ -253,7 +253,11 @@
         else:
             flags += ['-lgcc_s']
         compiler_rt = self.full_config.get_lit_bool('compiler_rt', False)
-        if not compiler_rt:
+        if compiler_rt:
+            builtins_lib = self.full_config.get_lit_conf('builtins_library')
+            if builtins_lib:
+                flags += [builtins_lib]
+        else:
             flags += ['-lgcc']
         use_libatomic = self.full_config.get_lit_bool('use_libatomic', False)
         if use_libatomic:
Index: libcxx/test/lit.site.cfg.in
===================================================================
--- libcxx/test/lit.site.cfg.in
+++ libcxx/test/lit.site.cfg.in
@@ -28,6 +28,7 @@
 config.executor                 = "@LIBCXX_EXECUTOR@"
 config.llvm_unwinder            = "@LIBCXXABI_USE_LLVM_UNWINDER@"
 config.compiler_rt              = "@LIBCXX_USE_COMPILER_RT@"
+config.builtins_library         = "@LIBCXX_BUILTINS_LIBRARY@"
 config.has_libatomic            = "@LIBCXX_HAS_ATOMIC_LIB@"
 config.use_libatomic            = "@LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@"
 config.debug_build              = "@LIBCXX_DEBUG_BUILD@"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56701.181710.patch
Type: text/x-patch
Size: 1327 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20190115/777fc3d1/attachment.bin>