From 61594ba1da0020506dd2b56bed169d2f3d1d08f4 Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Tue, 13 May 2014 12:03:15 +0400
Subject: [PATCH] Fix nortti builds on Intel compiler

---
 test/Jamfile.v2 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 1c2433b..d8b0010 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -14,8 +14,9 @@ tlib = /boost/test//boost_unit_test_framework/<link>static ;
 # Variable that contains all the stuff required for linking together <rtti>on and <rtti>off
 compat = <define>BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY ;
 
-# Making own `nortti` that is link compatible
-nortti = <toolset>gcc:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>clang:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>msvc:<cxxflags>/GR- ;
+# Making own `nortti` that is link compatible.
+# We explicitly define BOOST_NO_RTTI because it sometimes can not be detected by build system.
+nortti = <toolset>gcc:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>clang:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>intel:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>msvc:<cxxflags>/GR- ;
 
 
 # Making libraries that CANNOT work between rtti-on/rtti-off modules