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

Merge branch 's390x' into develop. Resolve conflicts.

Browse source
This commit is contained in:
Michael Caisse 2019-06-26 06:29:22 -07:00
commit 3bf4df1201
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boostcpp.jam
View file

@ -607,7 +607,7 @@ rule address-model ( )
return <conditional>@boostcpp.deduce-address-model ;
}
local deducable-architectures = arm mips1 power riscv sparc x86 combined ;
local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
for a in $(deducable-architectures)
{
@ -618,7 +618,7 @@ rule deduce-architecture ( properties * )
{
local result ;
local filtered = [ toolset-properties $(properties) ] ;
local names = arm mips1 power riscv sparc x86 combined ;
local names = arm mips1 power riscv s390x sparc x86 combined ;
local idx = [ configure.find-builds "default architecture" : $(filtered)
: /boost/architecture//arm
: /boost/architecture//mips1