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

[Peter Collingbourne via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL323300: libcxx: Allow auto-linking to be disabled with a macro. (authored by pcc, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D42436?vs=131181&id=131193#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D42436

Files:
  libcxx/trunk/include/__config


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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42436.131193.patch
Type: text/x-patch
Size: 816 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180124/9ea85c7a/attachment.bin>