From 2a46723127de8079e9e297a4e8ca45a2a3f09892 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 17 Sep 2007 19:29:06 +0000
Subject: [PATCH] Allow to specify version, and explicitly specify the command,
 when initializing the acc toolset.

[SVN r39354]
---
 src/tools/acc.jam | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/tools/acc.jam b/src/tools/acc.jam
index bad17d13a..350623030 100644
--- a/src/tools/acc.jam
+++ b/src/tools/acc.jam
@@ -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 @@ flags acc LINKFLAGS <threading>multi : -mt ;
 
 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