diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 4026d7ec..d428a2d2 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,6 +1,6 @@
 # copyright John Maddock 2003
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt.
 
 import modules ;
@@ -17,13 +17,13 @@ local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
 rule path_options ( properties * )
 {
     local result ;
-    if <address-model>64 in $(properties) && <toolset>msvc in $(properties) 
+    if <address-model>64 in $(properties) && <toolset>msvc in $(properties)
     {
-    	result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
+        result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
     }
     else
     {
-    	result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
+        result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
     }
     return $(result) ;
 }
@@ -34,24 +34,24 @@ rule path_options ( properties * )
 if ! $(disable-icu)
 {
    if [ modules.peek : ICU_LINK ]
-   {    
+   {
        errors.user-error : "The ICU_LINK option is no longer supported by the Boost.Regex build - please refer to the documentation for equivalent options" ;
    }
 
    if [ modules.peek : ICU_PATH ]
-   {    
+   {
        ICU_PATH =  [ modules.peek : ICU_PATH ] ;
    }
    if [ modules.peek : ICU_ICUUC_NAME ]
-   {    
+   {
        ICU_ICUUC_NAME =  [ modules.peek : ICU_ICUUC_NAME ] ;
    }
    if [ modules.peek : ICU_ICUDT_NAME ]
-   {    
+   {
        ICU_ICUDT_NAME =  [ modules.peek : ICU_ICUDT_NAME ] ;
    }
    if [ modules.peek : ICU_ICUIN_NAME ]
-   {    
+   {
        ICU_ICUIN_NAME =  [ modules.peek : ICU_ICUIN_NAME ] ;
    }
 
@@ -102,8 +102,8 @@ if ! $(disable-icu)
       lib icuin : : <name>this_is_an_invalid_library_name ;
    }
 
-   ICU_OPTS = 
-      <include>$(ICU_PATH)/include 
+   ICU_OPTS =
+      <include>$(ICU_PATH)/include
       <runtime-link>shared:<library>icuuc/<link>shared
       <runtime-link>shared:<library>icudt/<link>shared
       <runtime-link>shared:<library>icuin/<link>shared
@@ -111,7 +111,7 @@ if ! $(disable-icu)
       <runtime-link>static:<library>icudt
       <runtime-link>static:<library>icuin
       <target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
-      <define>BOOST_HAS_ICU=1 
+      <define>BOOST_HAS_ICU=1
       <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
       ;
 
@@ -144,13 +144,15 @@ explicit has_icu ;
 
 alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ;
 
-SOURCES = 
+SOURCES =
    posix_api.cpp
    wide_posix_api.cpp
 ;
 
 lib boost_regex : ../src/$(SOURCES) icu_options
-    :         
-	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
-	     <toolset>gcc-cygwin:<link>static
+    :
+        <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+        <toolset>gcc-cygwin:<link>static
+    : : :
+        <define>BOOST_REGEX_NO_LIB=1
     ;