[Boost-commit] svn:boost r84222 - trunk/libs/log/build

Subject: [Boost-commit] svn:boost r84222 - trunk/libs/log/build
From: andrey.semashev_at_[hidden]
Date: 2013-05-10 08:31:12

Author: andysem
Date: 2013-05-10 08:31:12 EDT (Fri, 10 May 2013)
New Revision: 84222
URL: http://svn.boost.org/trac/boost/changeset/84222

Log:
Removed override of the default 32 bit x86 instruction sets as it is not needed since Boost.Build now defaults to i686. Also removed log-api propagation as it seems to break the build sometimes.
Text files modified: 
   trunk/libs/log/build/Jamfile.v2 |    15 +--------------                         
   1 files changed, 1 insertions(+), 14 deletions(-)

Modified: trunk/libs/log/build/Jamfile.v2
==============================================================================
--- trunk/libs/log/build/Jamfile.v2	(original)
+++ trunk/libs/log/build/Jamfile.v2	2013-05-10 08:31:12 EDT (Fri, 10 May 2013)
@@ -26,7 +26,7 @@
 lib psapi ;
 lib ws2_32 ;
 
-feature.feature log-api : generic winnt unix : propagated ;
+feature.feature log-api : generic winnt unix ;
 
 rule select-instruction-set-flags ( properties * )
 {
@@ -42,19 +42,6 @@
         }
         result = <build>no ;
     }
-    else if $(instruction_set) = i686 && ! <instruction-set> in $(properties)
-    {
-        # We override the default <instruction-set> (which is i386 in this case) with our custom compiler flags.
-        # This hack is needed because Boost.Build fails to configure dependencies of this library if we modify <instruction-set> property.
-        if <toolset>gcc in $(properties) || <toolset>clang in $(properties) || <toolset>intel-linux in $(properties) || <toolset>intel-darwin in $(properties)
-        {
-            result = <cxxflags>"-march=i686" ;
-        }
-        else if <toolset>msvc-7.1 in $(properties)
-        {
-            result = <cxxflags>"/G6" ;
-        }
-    }
 
     return $(result) ;
 }