From e9bbb5c6483f13ef1f9f0ef74f6ef27920cbf240 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 30 Jun 2004 06:15:49 +0000
Subject: [PATCH] Add <toolset>msvc as optional property for msvc.compile*
 generators, otherwise, only RC->OBJ is tried when OBJ target is needed.

[SVN r23279]
---
 src/tools/builtin.jam | 8 ++++----
 src/tools/msvc.jam    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tools/builtin.jam b/src/tools/builtin.jam
index e87d28c69..d6f47e0ed 100644
--- a/src/tools/builtin.jam
+++ b/src/tools/builtin.jam
@@ -607,10 +607,10 @@ class compile-action : action
 class C-compiling-generator : generator
 {
     rule __init__ ( id : source-types + : target-types + :
-        requirements * )
+        requirements * : optional-properties * )
     {
         generator.__init__ $(id) : $(source-types) : $(target-types) :
-          $(requirements) ;
+          $(requirements) : $(optional-properties) ;
     }
         
     rule action-class ( )
@@ -620,10 +620,10 @@ class C-compiling-generator : generator
 }
 
 rule register-c-compiler ( id : source-types + : target-types + :
-                            requirements * )
+                            requirements * : optional-properties * )
 {
     local g = [ new C-compiling-generator $(id) : $(source-types) 
-                : $(target-types) : $(requirements) ] ;
+                : $(target-types) : $(requirements) : $(optional-properties) ] ;
     generators.register $(g) ;
 }
 
diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
index 3a38fa0f7..bcdc1936b 100644
--- a/src/tools/msvc.jam
+++ b/src/tools/msvc.jam
@@ -178,8 +178,8 @@ generators.register-linker msvc.link : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB :
 generators.register-linker msvc.link.dll : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB : SHARED_LIB IMPORT_LIB RSP : <toolset>msvc ;
 
 generators.register-composing msvc.archive : OBJ : STATIC_LIB RSP : <toolset>msvc ;
-generators.register-c-compiler msvc.compile.c++ : CPP : OBJ : <toolset>msvc ;
-generators.register-c-compiler msvc.compile.c : C : OBJ : <toolset>msvc ;
+generators.register-c-compiler msvc.compile.c++ : CPP : OBJ : <toolset>msvc : <toolset>msvc ;
+generators.register-c-compiler msvc.compile.c : C : OBJ : <toolset>msvc : <toolset>msvc ;
 generators.register-standard msvc.compile.rc : RC : OBJ(%_res) : <toolset>msvc : <toolset>msvc ;
 
 #