mirror of
https://github.com/boostorg/build.git
synced 2026-02-18 01:52:17 +00:00
Add <toolset>msvc as optional property for msvc.compile* generators,
otherwise, only RC->OBJ is tried when OBJ target is needed. [SVN r23279]
This commit is contained in:
@@ -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) ;
|
||||
}
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user