Fix ICU configuration to use static library only when using a static runtime

This commit is contained in:
John Maddock
2016-07-20 18:20:37 +00:00
parent a824b7d236
commit ddd808f761

View File

@ -26,7 +26,6 @@ rule path_options ( properties * )
return $(result) ; return $(result) ;
} }
# #
# ICU configuration: # ICU configuration:
# #
@ -78,9 +77,12 @@ if ! $(disable-icu)
ICU_OPTS = ICU_OPTS =
<include>$(ICU_PATH)/include <include>$(ICU_PATH)/include
<library>icuuc <runtime-link>shared:<library>icuuc/<link>shared
<library>icudt <runtime-link>shared:<library>icudt/<link>shared
<library>icuin <runtime-link>shared:<library>icuin/<link>shared
<runtime-link>static:<library>icuuc
<runtime-link>static:<library>icudt
<runtime-link>static:<library>icuin
<define>BOOST_HAS_ICU=1 <define>BOOST_HAS_ICU=1
<runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1 <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
; ;