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

Use the right setup scripts for several tools. Previously, the first setup script processed would be applied unconditionally, because api was not defined which leaves the condition blank, and later setup scripts would be applied to winapi=phone, because api was not properly localized.

Browse Source
This commit is contained in:
Steven Watanabe
2017-12-14 12:26:24 -07:00
parent dbff38df17
commit 7369dd2631
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/msvc.jam
View File

@@ -1189,18 +1189,19 @@ local rule configure-really ( version ? : options * )
local cpu-assembler = $(assembler) ;
cpu-assembler ?= $(default-assembler-$(c)) ;
toolset.flags msvc.compile .RC <windows-api>$(api)/$(cpu-conditions) : $(setup-$(c))$(resource-compiler) ;
toolset.flags msvc.compile .IDL <windows-api>$(api)/$(cpu-conditions) : $(setup-$(c))$(idl-compiler) ;
toolset.flags msvc.compile .MC <windows-api>$(api)/$(cpu-conditions) : $(setup-$(c))$(mc-compiler) ;
toolset.flags msvc.link .MT <windows-api>$(api)/$(cpu-conditions) : $(setup-$(c))$(manifest-tool) -nologo ;
for api in desktop store phone
for local api in desktop store phone
{
local setup-script = $(setup-$(c)) ;
if $(api) = phone
{
setup-script = $(setup-phone-$(c)) ;
}
toolset.flags msvc.compile .RC <windows-api>$(api)/$(cpu-conditions) : $(setup-script)$(resource-compiler) ;
toolset.flags msvc.compile .IDL <windows-api>$(api)/$(cpu-conditions) : $(setup-script)$(idl-compiler) ;
toolset.flags msvc.compile .MC <windows-api>$(api)/$(cpu-conditions) : $(setup-script)$(mc-compiler) ;
toolset.flags msvc.link .MT <windows-api>$(api)/$(cpu-conditions) : $(setup-script)$(manifest-tool) -nologo ;
if $(api) = desktop
{
toolset.flags msvc.compile .CC <windows-api>$(api)/$(cpu-conditions) : $(setup-script)$(compiler) /Zm800 -nologo ;