commit e585baf371a3483e95c88ab34bd1bbf1683792b1
author Marshall Clow <mclow.lists@gmail.com> Fri Jul 13 17:24:59 2018 +0000
committer Marshall Clow <mclow.lists@gmail.com> Fri Jul 13 17:24:59 2018 +0000
tree 8c2235f1e3ab6993c76a9f8d1541e70c5462d07d
parent c005c7e34c3d22d1dba2cfe62c79f9e8be2d60de

Shot in the dark to fix gcc 4.9 / c++11 build



git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@337027 91177308-0d34-0410-b5e6-96231b3b80d8

include/__config

diff --git a/include/__config b/include/__config
index 87ba7e6..65df5dd 100644
--- a/include/__config
+++ b/include/__config
@@ -1024,10 +1024,10 @@
 #endif
 
 #ifndef _LIBCPP_CONSTEXPR_IF_NODEBUG
-#if !defined(_LIBCPP_DEBUG) && _LIBCPP_STD_VER >= 14
-#define _LIBCPP_CONSTEXPR_IF_NODEBUG constexpr
-#else
+#if defined(_LIBCPP_DEBUG) || _LIBCPP_HAS_NO_CXX14_CONSTEXPR
 #define _LIBCPP_CONSTEXPR_IF_NODEBUG
+#else
+#define _LIBCPP_CONSTEXPR_IF_NODEBUG constexpr
 #endif
 #endif