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

Apply Jamroot/boostcpp.jam patches

Browse source
This commit is contained in:
Peter Dimov 2017-07-01 02:06:33 +03:00
parent 1b6bbe61b3
commit d041c3cf27
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Jamroot
View file

@ -201,10 +201,15 @@ rule handle-static-runtime ( properties * )
if <link>shared in $(properties) && <runtime-link>static in $(properties) &&
! ( <toolset>cw in $(properties) )
{
ECHO "error: link=shared together with runtime-link=static is not allowed" ;
ECHO "error: such property combination is either impossible " ;
ECHO "error: or too dangerious to be of any use" ;
EXIT ;
if ! $(.shared-static-warning-emitted)
{
ECHO "warning: skipping configuration link=shared, runtime-link=static" ;
ECHO "warning: this combination is either impossible or too dangerous" ;
ECHO "warning: to be of any use" ;
.shared-static-warning-emitted = 1 ;
}
return <build>no ;
}
}

2
boostcpp.jam
View file

@ -372,7 +372,7 @@ class top-level-target : alias-target-class
self.complete-properties = [ property-set.create
<variant>debug <variant>release
<threading>single <threading>multi
<threading>multi
<link>shared <link>static
<runtime-link>shared <runtime-link>static ] ;
}