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

Subject: [Boost-commit] svn:boost r50708 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2009-01-21 14:37:33

Author: vladimir_prus
Date: 2009-01-21 14:37:33 EST (Wed, 21 Jan 2009)
New Revision: 50708
URL: http://svn.boost.org/trac/boost/changeset/50708

Log:
Make cflags/cxxflags/linkflags work with intel-linux
Text files modified: 
   trunk/tools/build/v2/tools/intel-linux.jam |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 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	2009-01-21 14:37:33 EST (Wed, 21 Jan 2009)
@@ -91,7 +91,7 @@
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.c ( targets * : sources * : properties * )
@@ -102,7 +102,7 @@
 
 actions compile.c
 {
-    "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 rule link ( targets * : sources * : properties * )
@@ -114,7 +114,7 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS) $(USER_OPTIONS)
 }
 
 rule link.dll ( targets * : sources * : properties * )