Merge branch 'RC_1_1'

This commit is contained in:
arvidn 2016-06-10 18:50:27 -04:00
commit 236f000f9f
1 changed files with 2 additions and 2 deletions

View File

@ -496,12 +496,12 @@ variant test_debug : debug
: <crypto>openssl <logging>on <disk-stats>on
<allocator>debug
<invariant-checks>full <boost-link>shared
<export-extra>on <debug-iterators>on <threading>multi
<export-extra>on <debug-iterators>on <threading>multi <asserts>on
;
variant test_barebones : debug
: <ipv6>off <dht>off <extensions>off <logging>off <boost-link>shared
<deprecated-functions>off <invariant-checks>off
<export-extra>on <debug-iterators>on <threading>multi
<export-extra>on <debug-iterators>on <threading>multi <asserts>on
;
# required for openssl on windows