organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-05 13:35:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

fix deduction of architecture and address-model

Browse source
This commit is contained in:
Dmitry Arkhipov 2024-04-02 18:52:31 +03:00 • committed by Peter Dimov
parent 064f557086
commit a2b06de074
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
boostcpp.jam
View file

@ -620,15 +620,18 @@ rule deduce-address-model ( properties * )
: /boost/architecture//64 "64-bit" ] ;
result = $(names[$(idx)]) ;
if $(result)
local am = [ property.select <address-model> : $(properties) ] ;
if ! $(am)
{
# Normally, returning composite feature here is equivalent to forcing
# constituent properties as well. But we only want to indicate toolset
# deduced default, so also pick whatever address-model is explicitly
# specified, if any.
result = <deduced-address-model>$(result) [ property.select <address-model> : $(properties) ] ;
return <deduced-address-model>$(result) ;
}
return $(result) ;
if $(am:G=) = $(result)
{
return <deduced-address-model>$(result) $(am) ;
}
return ;
}
rule address-model ( )
@ -660,12 +663,18 @@ rule deduce-architecture ( properties * )
: /boost/architecture//combined ] ;
result = $(names[$(idx)]) ;
if $(result)
local arch = [ property.select <architecture> : $(properties) ] ;
if ! $(arch)
{
# See comment in deduce-address-model.
result = <deduced-architecture>$(result) [ property.select <architecture> : $(properties) ] ;
return <deduced-architecture>$(result) ;
}
return $(result) ;
if $(arch:G=) = $(result)
{
return <deduced-architecture>$(result) $(arch) ;
}
return ;
}
rule architecture ( )