From 726fc91c8fc6866ab2d3ee8667fad55317f16c65 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sun, 14 Oct 2007 09:55:41 +0000
Subject: [PATCH]    * common.jam (get-invocation-command): When    we cannot
 find a specified tool, return    tool's name so that the command line looks
 sane,    even if it does not work.    (handle-options): Report which command
 will    be used, in debug mode.

[SVN r40008]
---
 src/tools/common.jam | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tools/common.jam b/src/tools/common.jam
index 0ac715791..9ba7331ba 100644
--- a/src/tools/common.jam
+++ b/src/tools/common.jam
@@ -250,6 +250,7 @@ rule get-invocation-command (
                 ECHO "warning: toolset $(toolset) initialization: can't find tool $(tool)" ;
                 ECHO "warning: initialized from" [ errors.nearest-user-location ] ;
             }
+            command = $(tool) ;
         }        
     }
     else
@@ -268,10 +269,7 @@ rule get-invocation-command (
             command = $(user-provided-command) ;
         }        
     }
-    if ! $(command)
-    {        
-        command = $(user-provided-command) ;
-    }    
+
     return $(command) ;
 }
 
@@ -378,6 +376,11 @@ rule check-tool ( xcommand + )
 # - OPTIONs for link to the value of <linkflags> in options
 rule handle-options ( toolset : condition * : command * : options * )
 {
+    if $(.debug-configuration)
+    {
+        ECHO "notice: will use '$(command)' for $(toolset), condition $(condition:E=(empty))" ;
+    }
+    
     # The last parameter ('true') says it's OK to set flags for another
     # module,   
     toolset.flags $(toolset) CONFIG_COMMAND $(condition) : $(command) : unchecked ;