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

From: ghost_at_[hidden]
Date: 2007-09-17 15:29:14

Author: vladimir_prus
Date: 2007-09-17 15:29:06 EDT (Mon, 17 Sep 2007)
New Revision: 39354
URL: http://svn.boost.org/trac/boost/changeset/39354

Log:
Allow to specify version, and explicitly specify
the command, when initializing the acc toolset.

Text files modified: 
   trunk/tools/build/v2/tools/acc.jam |    19 +++++++++++++------                     
   1 files changed, 13 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/tools/acc.jam
==============================================================================
--- trunk/tools/build/v2/tools/acc.jam	(original)
+++ trunk/tools/build/v2/tools/acc.jam	2007-09-17 15:29:06 EDT (Mon, 17 Sep 2007)
@@ -12,16 +12,23 @@
 import toolset : flags ;
 import feature ;
 import generators ;
+import common ;
 
 feature.extend toolset : acc ;
 toolset.inherit acc : unix ;
 generators.override builtin.lib-generator : acc.prebuilt ;
 generators.override acc.searched-lib-generator : searched-lib-generator ;
-feature.subfeature toolset acc : version ;
 
 # Configures the acc toolset. 
-rule init ( version ? : path * )
+rule init ( version ? : user-provided-command * : options * )
 {
+    local condition = [ common.check-init-parameters acc 
+        : version $(version) ] ;
+    
+    local command = [ common.get-invocation-command acc : aCC
+        : $(user-provided-command) ] ;
+    
+    common.handle-options acc : $(condition) : $(command) : $(options) ;
 }
 
 
@@ -76,22 +83,22 @@
 
 actions acc.link bind NEEDLIBS
 {
-    aCC $(LINKFLAGS) +DD64 -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
+    $(CONFIG_COMMAND) $(LINKFLAGS) +DD64 -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
 }
 
 actions acc.link.dll bind NEEDLIBS
 {
-    aCC -b $(LINKFLAGS) +DD64 -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS)
+    $(CONFIG_COMMAND) -b $(LINKFLAGS) +DD64 -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
 }
 
 actions acc.compile.c
 {    
-    aCC -Ae +DD64 -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(CONFIG_COMMAND) -Ae +DD64 -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" $(OPTIONS)
 }
 
 actions acc.compile.c++
 {
-    aCC -AA +DD64 -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(CONFIG_COMMAND) -AA +DD64 -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" $(OPTIONS)
 }
 
 actions updated together piecemeal acc.archive