From ddd808f7614f9f33bcbf645c4ec8873af3ad4b20 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 20 Jul 2016 18:20:37 +0000
Subject: [PATCH] Fix ICU configuration to use static library only when using a
 static runtime

---
 build/Jamfile.v2 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index ad57a254..ee8e3b34 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -26,7 +26,6 @@ rule path_options ( properties * )
     return $(result) ;
 }
 
-
 #
 # ICU configuration:
 #
@@ -78,9 +77,12 @@ if ! $(disable-icu)
 
       ICU_OPTS = 
          <include>$(ICU_PATH)/include 
-         <library>icuuc
-         <library>icudt
-         <library>icuin
+         <runtime-link>shared:<library>icuuc/<link>shared
+         <runtime-link>shared:<library>icudt/<link>shared
+         <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 
          <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
          ;