Index: test/libcxx/test/target_info.py
===================================================================
--- test/libcxx/test/target_info.py
+++ test/libcxx/test/target_info.py
@@ -108,7 +108,12 @@
         # libc++ yet so we still need to explicitly link libc++abi when testing
         # libc++abi
         # See PR22654.
-        if(self.full_config.get_lit_conf('name', '') == 'libc++abi'):
+        lit_conf_name = self.full_config.get_lit_conf('name', '')
+        if(lit_conf_name == 'libc++abi'):
+            return True
+        # Needs explicit linking of libc++abi for static libc++ builds
+        if(lit_conf_name == 'libc++' and
+           not self.full_config.get_lit_bool('enable_shared', True)):
             return True
         # Don't link libc++abi explicitly on OS X because the symbols
         # should be available in libc++ directly.