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

Subject: [Boost-commit] svn:boost r57140 - trunk/tools/build/v2/tools
From: daniel_james_at_[hidden]
Date: 2009-10-24 14:03:02

Author: danieljames
Date: 2009-10-24 14:03:02 EDT (Sat, 24 Oct 2009)
New Revision: 57140
URL: http://svn.boost.org/trac/boost/changeset/57140

Log:
Make cflags and cxxflags work for intel linux.

This was originally in [50708] but appears to have been accidentally undone in
[51570].

Text files modified: 
   trunk/tools/build/v2/tools/intel-linux.jam |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 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-10-24 14:03:02 EDT (Sat, 24 Oct 2009)
@@ -118,7 +118,7 @@
 
 actions compile.c++ bind PCH_FILE
 {
-    "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)"  -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)"  -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.c ( targets * : sources * : properties * )
@@ -131,7 +131,7 @@
 
 actions compile.c bind PCH_FILE
 {
-    "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.c++.pch ( targets * : sources * : properties * )