From 05d64fbddbb2816c1f5301786eadb9b6d05315bc Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Thu, 26 May 2005 05:54:16 +0000
Subject: [PATCH] Unroll incomplete changes to response files support.

I think that Dave committed then unintentionally in revision 1.36 and they
cause C++ files to be always recompiled. A better version is in the works
but cannot be committed yet, so I'll just restore the previous one for now.


[SVN r29198]
---
 v2/tools/msvc.jam | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam
index 798ba6759..d79ff321e 100644
--- a/v2/tools/msvc.jam
+++ b/v2/tools/msvc.jam
@@ -231,7 +231,7 @@ 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-archiver 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++ : CPP : OBJ RSP(%_cpp) : <toolset>msvc ;
 generators.register-c-compiler msvc.compile.c : C : OBJ RSP(%_cpp) : <toolset>msvc ;
 generators.register-standard msvc.compile.rc : RC : OBJ(%_res) : <toolset>msvc ;
 generators.override msvc.compile.rc : rc.resource-compile ;
@@ -271,9 +271,9 @@ actions compile.c
 {
     $(.CC) /Zm800 -nologo -TC -U$(UNDEFS) $(CFLAGS) $(USER_CFLAGS) @"$(<[2]:W)" -c -Fo"$(<[1]:W)"
 }
-actions compile.c++ bind RSP
+actions compile.c++
 {
-    $(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)"  && del "$(RSP)"
+    $(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(USER_CFLAGS) @"$(<[2]:W)" -c -Fo"$(<[1]:W)" 
 }
 
 actions compile.rc
@@ -365,10 +365,7 @@ actions link.dll bind DEF_FILE
 
 rule compile.c++ ( targets + : sources * : properties * )
 {
-    local response-file = $(targets[1]).rsp ;
-    RSP on $(targets) = $(response-file) ;
-    LOCATE on $(response-file) = [ on $(targets[1]) return $(LOCATE) ] ;
-    common.response-file $(targets) : $(sources) : $(response-file) : $(properties) ;
+    common.response-file $(targets) : $(sources) : $(targets[2]) : $(properties) ;
 }
 
 rule compile.c ( targets + : sources * : properties * )