Skip to content

Commit bbd3635

Browse files
sgerbinovinniefalco
authored andcommitted
Statically link Boost.JSON in unit tests
1 parent 9810794 commit bbd3635

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

build/Jamfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ lib boost_http
5656
<library>/boost/json//boost_json/<warnings-as-errors>off
5757
<library>/boost//url
5858
<define>BOOST_COROSIO_NO_LIB
59-
<link>shared:<define>BOOST_JSON_DYN_LINK=1
59+
<define>BOOST_JSON_DYN_LINK=1
6060
<target-os>windows:<library>bcrypt_sys
6161
<target-os>darwin:<linkflags>"-framework Security"
6262
;

test/unit/Jamfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ lib test_helpers_lib
1717
../../../url/extra/test_suite/test_main.cpp
1818
../../../url/extra/test_suite/test_suite.cpp
1919
: requirements
20-
<link>shared:<define>BOOST_JSON_DYN_LINK=1
2120
<library>/boost/http//boost_http
2221
<library>/boost/url//boost_url
2322
<include>.
@@ -33,7 +32,6 @@ lib test_helpers_lib
3332
project
3433
: requirements
3534
$(c11-requires)
36-
<link>shared:<define>BOOST_JSON_DYN_LINK=1
3735
<library>/boost/http//boost_http
3836
<library>/boost/url//boost_url
3937
[ ac.check-library /boost/http//boost_http_zlib : <library>/boost/http//boost_http_zlib : ]
@@ -44,7 +42,7 @@ project
4442
<include>../../../url/extra/test_suite
4543
<warnings>extra
4644
<warnings-as-errors>on
47-
<target-os>darwin,<undefined-sanitizer>norecover:<link>static
45+
<link>static
4846
;
4947

5048
for local f in [ glob-tree-ex . : *.cpp : file*.cpp test_helpers.cpp ]
@@ -57,6 +55,6 @@ for local f in [ glob-tree-ex . : file*.cpp ]
5755
run $(f)
5856
: requirements
5957
<library>/boost/filesystem//boost_filesystem
60-
<warnings>off <undefined-sanitizer>norecover:<link>static
58+
<warnings>off
6159
;
6260
}

0 commit comments

Comments
 (0)