From 4021362b4fd99203f4f892ca380f5d1fda8dc249 Mon Sep 17 00:00:00 2001 From: Spencer E. Olson Date: Wed, 6 Jan 2010 12:53:12 -0700 Subject: [PATCH 2/2] improved usage for icc suite--USER_OPTIONS are now honored --- tools/build/v2/tools/intel-linux.jam | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/build/v2/tools/intel-linux.jam b/tools/build/v2/tools/intel-linux.jam index 9a4f11a..06e11fe 100644 --- a/tools/build/v2/tools/intel-linux.jam +++ b/tools/build/v2/tools/intel-linux.jam @@ -32,7 +32,8 @@ type.set-generated-target-suffix PCH : intel li toolset.inherit-rules intel-linux : gcc ; toolset.inherit-flags intel-linux : gcc - : off on full space + : off on full + space speed off all on ; @@ -103,6 +104,7 @@ rule init ( version ? : command * : options * ) SPACE = " " ; flags intel-linux.compile OPTIONS space : "-O1" ; # no specific space optimization flag in icc +flags intel-linux.compile OPTIONS speed : "-O3 -ip" ; # no specific space optimization flag in icc flags intel-linux.compile OPTIONS off : -w0 ; flags intel-linux.compile OPTIONS on : -w1 ; @@ -147,7 +149,7 @@ rule compile.c++.pch ( targets * : sources * : properties * ) # 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 @@ rule compile.c.pch ( targets * : sources * : properties * ) 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 @@ rule link.dll ( targets * : sources * : properties * ) # 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) } -- 1.6.3.3