[Boost-commit] svn:boost r50749 - in branches/release: . tools/build/v2/tools

Subject: [Boost-commit] svn:boost r50749 - in branches/release: . tools/build/v2/tools
From: juergen.hunold_at_[hidden]
Date: 2009-01-23 15:28:20

Author: jhunold
Date: 2009-01-23 15:28:19 EST (Fri, 23 Jan 2009)
New Revision: 50749
URL: http://svn.boost.org/trac/boost/changeset/50749

Log:
Merged revisions 50708 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r50708 | vladimir_prus | 2009-01-21 20:37:33 +0100 (Wed, 21 Jan 2009) | 1 line
  
  Make cflags/cxxflags/linkflags work with intel-linux
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/tools/intel-linux.jam |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: branches/release/tools/build/v2/tools/intel-linux.jam
==============================================================================
--- branches/release/tools/build/v2/tools/intel-linux.jam	(original)
+++ branches/release/tools/build/v2/tools/intel-linux.jam	2009-01-23 15:28:19 EST (Fri, 23 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 * )