[libcxx-commits] [libcxx] [libc++][test] Workaround for atomic tests linker errors on Linux systems without libatomic.so (PR #73398)

[Louis Dionne via libcxx-commits]

================
@@ -289,6 +286,62 @@ def _getAndroidDeviceApi(cfg):
             AddSubstitution("%{clang-tidy}", lambda cfg: _getSuitableClangTidy(cfg))
         ],
     ),
+    Feature(name="apple-clang", when=_isAppleClang),
----------------
ldionne wrote:

This part of the diff looks like a merge conflict to me.

https://github.com/llvm/llvm-project/pull/73398