back-port fixes to Jamfile from master

This commit is contained in:
Arvid Norberg 2018-05-11 23:56:04 +02:00 committed by Arvid Norberg
parent a2c6136f44
commit 90e82152b0
1 changed files with 4 additions and 4 deletions

View File

@ -796,11 +796,11 @@ local usage-requirements =
<define>BOOST_ASIO_ENABLE_CANCELIO <define>BOOST_ASIO_ENABLE_CANCELIO
<conditional>@linking <conditional>@linking
# these compiler settings just makes the compiler standard conforming # these compiler settings just makes the compiler standard conforming
<toolset>msvc:<cflags>/Zc:wchar_t <toolset>msvc:<cflags>"/Zc:wchar_t"
<toolset>msvc:<cflags>/Zc:forScope <toolset>msvc:<cflags>"/Zc:forScope"
# msvc optimizations # msvc optimizations
<toolset>msvc,<variant>release:<linkflags>/OPT:ICF=5 <toolset>msvc,<variant>release:<linkflags>"/OPT:ICF=5"
<toolset>msvc,<variant>release:<linkflags>/OPT:REF <toolset>msvc,<variant>release:<linkflags>"/OPT:REF"
<cxxflags>$(CXXFLAGS) <cxxflags>$(CXXFLAGS)
<linkflags>$(LDFLAGS) <linkflags>$(LDFLAGS)