[PATCH] D42436: libcxx: Allow auto-linking to be disabled with a macro.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.
pcc added reviewers: compnerd, smeenai.
Herald added a reviewer: EricWF.

Some users may have a custom build system which gives a different
name to the libc++ archive (or does not create an archive at all,
instead passing the object files directly to the linker). Give those
users a way to disable auto-linking.


https://reviews.llvm.org/D42436

Files:
  libcxx/include/__config


Index: libcxx/include/__config
===================================================================
--- libcxx/include/__config
+++ libcxx/include/__config
@@ -1284,13 +1284,13 @@
 # endif
 #endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO)
 
-#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
+#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) && !defined(_LIBCPP_NO_AUTO_LINK)
 # if defined(_DLL)
 #   pragma comment(lib, "c++.lib")
 # else
 #   pragma comment(lib, "libc++.lib")
 # endif
-#endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
+#endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) && !defined(_LIBCPP_NO_AUTO_LINK)
 
 #endif // __cplusplus
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42436.131121.patch
Type: text/x-patch
Size: 762 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180123/3d6a0c6c/attachment.bin>