[Boost-commit] svn:boost r59285 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r59285 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2010-01-27 15:52:06

Author: vladimir_prus
Date: 2010-01-27 15:52:05 EST (Wed, 27 Jan 2010)
New Revision: 59285
URL: http://svn.boost.org/trac/boost/changeset/59285

Log:
Intel improvements:
1.  Honors USER_OPTION (that is cflags/cxxflags features)
2.  Adds an <optimization>speed option

Patch from Spencer Olson.

Text files modified: 
   trunk/tools/build/v2/tools/intel-linux.jam |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-linux.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-linux.jam	(original)
+++ trunk/tools/build/v2/tools/intel-linux.jam	2010-01-27 15:52:05 EST (Wed, 27 Jan 2010)
@@ -32,7 +32,8 @@
 
 toolset.inherit-rules intel-linux : gcc ;
 toolset.inherit-flags intel-linux : gcc 
-        : <inlining>off <inlining>on <inlining>full <optimization>space 
+        : <inlining>off <inlining>on <inlining>full
+          <optimization>space <optimization>speed
           <warnings>off <warnings>all <warnings>on
         ;
         
@@ -103,6 +104,7 @@
 SPACE = " " ;
 
 flags intel-linux.compile OPTIONS <optimization>space : "-O1" ; # no specific space optimization flag in icc
+flags intel-linux.compile OPTIONS <optimization>speed : "-O3 -ip" ; # no specific space optimization flag in icc
 
 flags intel-linux.compile OPTIONS <warnings>off : -w0 ;
 flags intel-linux.compile OPTIONS <warnings>on : -w1 ;
@@ -147,7 +149,7 @@
 #
 actions compile.c++.pch
 {
-    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
+    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
 }
 
 actions compile.fortran
@@ -164,7 +166,7 @@
 
 actions compile.c.pch
 {
-    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
+    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
 }
 
 rule link ( targets * : sources * : properties * )
@@ -191,7 +193,7 @@
 # Differ from 'link' above only by -shared.
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS) $(USER_OPTIONS)
 }