[PATCH] D49997: [libcxx] Fix _LIBCPP_NO_EXCEPTIONS redefined warning

[Jason Lovett via Phabricator via cfe-commits]

jasonl220 created this revision.
jasonl220 added a reviewer: mclow.lists.
Herald added a reviewer: EricWF.
Herald added subscribers: cfe-commits, ldionne.

Fix GCC 7.2.0 redefinition warning when LIBCXX_ENABLE_EXCEPTIONS cmake option is not set.

> llvm/projects/libcxx/include/__config:514:0: warning: "_LIBCPP_NO_EXCEPTIONS" redefined
>  #define _LIBCPP_NO_EXCEPTIONS
> 
> <command-line>:0:0: note: this is the location of the previous definition

This warning fires every time __config is included, 33 in total.


Repository:
  rCXX libc++

https://reviews.llvm.org/D49997

Files:
  __config


Index: __config
===================================================================
--- __config
+++ __config
@@ -510,7 +510,7 @@
 #define _LIBCPP_HAS_IS_BASE_OF
 #endif
 
-#if !__EXCEPTIONS
+#if !__EXCEPTIONS && !defined(_LIBCPP_NO_EXCEPTIONS)
 #define _LIBCPP_NO_EXCEPTIONS
 #endif
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D49997.157891.patch
Type: text/x-patch
Size: 286 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180730/fb7be842/attachment.bin>