Subject: [Boost-commit] svn:boost r86147 - in trunk: boost/log/detail libs/log/build
From: andrey.semashev_at_[hidden]
Date: 2013-10-03 15:25:58
Author: andysem
Date: 2013-10-03 15:25:58 EDT (Thu, 03 Oct 2013)
New Revision: 86147
URL: http://svn.boost.org/trac/boost/changeset/86147
Log:
Fixes for building with Clang on Darwin.
Text files modified:
trunk/boost/log/detail/config.hpp | 2 +-
trunk/libs/log/build/Jamfile.v2 | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Modified: trunk/boost/log/detail/config.hpp
==============================================================================
--- trunk/boost/log/detail/config.hpp Thu Oct 3 13:41:22 2013 (r86146)
+++ trunk/boost/log/detail/config.hpp 2013-10-03 15:25:58 EDT (Thu, 03 Oct 2013) (r86147)
@@ -316,7 +316,7 @@
namespace BOOST_LOG_VERSION_NAMESPACE {}
using namespace BOOST_LOG_VERSION_NAMESPACE
-# if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+# if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && !defined(__clang__)
__attribute__((__strong__))
# endif
;
Modified: trunk/libs/log/build/Jamfile.v2
==============================================================================
--- trunk/libs/log/build/Jamfile.v2 Thu Oct 3 13:41:22 2013 (r86146)
+++ trunk/libs/log/build/Jamfile.v2 2013-10-03 15:25:58 EDT (Thu, 03 Oct 2013) (r86147)
@@ -110,6 +110,7 @@
<toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
<toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
<toolset>darwin:<cxxflags>-ftemplate-depth-1024
+ <toolset>clang:<cxxflags>-ftemplate-depth-1024
<toolset>gcc:<cxxflags>-ftemplate-depth-1024
<toolset>gcc:<cxxflags>-fno-strict-aliasing # avoids strict aliasing violations in other Boost components
<toolset>gcc-mingw:<linkflags>-Wl,--enable-auto-import