boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Unroll incomplete changes to response files support.

Browse Source 
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]
This commit is contained in:
Vladimir Prus
2005-05-26 05:54:16 +00:00
parent b02c3921b0
commit 05d64fbddb
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
v2/tools/msvc.jam
View File

@@ -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 * )