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

Subject: [Boost-commit] svn:boost r84207 - trunk/libs/log/build
From: andrey.semashev_at_[hidden]
Date: 2013-05-09 13:37:27

Author: andysem
Date: 2013-05-09 13:37:26 EDT (Thu, 09 May 2013)
New Revision: 84207
URL: http://svn.boost.org/trac/boost/changeset/84207

Log:
Hotfix to work around Boost.Build problem (it does not detect compiler version).
Text files modified: 
   trunk/libs/log/build/Jamfile.v2 |    50 ++++++++++++++++++++++----------------- 
   1 files changed, 28 insertions(+), 22 deletions(-)

Modified: trunk/libs/log/build/Jamfile.v2
==============================================================================
--- trunk/libs/log/build/Jamfile.v2	(original)
+++ trunk/libs/log/build/Jamfile.v2	2013-05-09 13:37:26 EDT (Thu, 09 May 2013)
@@ -225,25 +225,28 @@
         else if <toolset>intel in $(properties)
         {
             local string_version = [ feature.get-values "toolset-intel:version" : $(properties) ] ;
-            local version = [ SPLIT_BY_CHARACTERS $(string_version) : "." ] ;
-
-            if ! [ version.version-less $(version) : 10 0 ]
+            if $(string_version)
             {
-                if <toolset-intel:platform>win in $(properties)
+                local version = [ SPLIT_BY_CHARACTERS $(string_version) : "." ] ;
+
+                if ! [ version.version-less $(version) : 10 0 ]
                 {
-                    if ! [ version.version-less $(version) : 11 0 ]
+                    if <toolset-intel:platform>win in $(properties)
                     {
-                        result = <cxxflags>"/QxSSSE3" ;
+                        if ! [ version.version-less $(version) : 11 0 ]
+                        {
+                            result = <cxxflags>"/QxSSSE3" ;
+                        }
+                        else
+                        {
+                            result = <cxxflags>"/QxT" ;
+                        }
                     }
                     else
                     {
-                        result = <cxxflags>"/QxT" ;
+                        result = <cxxflags>"-march=core2 -msse -msse2 -msse3 -mssse3" ;
                     }
                 }
-                else
-                {
-                    result = <cxxflags>"-march=core2 -msse -msse2 -msse3 -mssse3" ;
-                }
             }
         }
     }
@@ -313,19 +316,22 @@
         else if <toolset>intel in $(properties)
         {
             local string_version = [ feature.get-values "toolset-intel:version" : $(properties) ] ;
-            local version = [ SPLIT_BY_CHARACTERS $(string_version) : "." ] ;
-
-            # AVX2 support added in Composer XE 2011 Update 7, while the original Composer XE 2011 had icc version 12.
-            # I don't know what version Update 7 had, so to be on the safe side enable this optimization since version 13.
-            if ! [ version.version-less $(version) : 13 0 ]
+            if $(string_version)
             {
-                if <toolset-intel:platform>win in $(properties)
-                {
-                    result = <cxxflags>"/QxAVX2" ;
-                }
-                else
+                local version = [ SPLIT_BY_CHARACTERS $(string_version) : "." ] ;
+
+                # AVX2 support added in Composer XE 2011 Update 7, while the original Composer XE 2011 had icc version 12.
+                # I don't know what version Update 7 had, so to be on the safe side enable this optimization since version 13.
+                if ! [ version.version-less $(version) : 13 0 ]
                 {
-                    result = <cxxflags>"-march=core-avx2 -mavx -mavx2 -fabi-version=0" ;
+                    if <toolset-intel:platform>win in $(properties)
+                    {
+                        result = <cxxflags>"/QxAVX2" ;
+                    }
+                    else
+                    {
+                        result = <cxxflags>"-march=core-avx2 -mavx -mavx2 -fabi-version=0" ;
+                    }
                 }
             }
         }