From cef369efa5dc8245fc7f09a0cd2c2741050839b1 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 18 Nov 2010 18:27:40 +0000
Subject: [PATCH] Search in lib64 and bin64 for ICU binaries.

[SVN r66640]
---
 build/Jamfile.v2 | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 312632f8..1f2ff25e 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -33,24 +33,44 @@ if ! $(disable-icu)
    }
    else
    {
-      lib icuuc : : <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
+      lib icuuc : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
+      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
       lib icuuc : : <name>this_is_an_invalid_library_name ;
-      lib icudt : : <search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
-      lib icudt : : <search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
+      lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
+      lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
       lib icudt : : <name>this_is_an_invalid_library_name ;
-      lib icuin : : <search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
-      lib icuin : : <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-      lib icuin : : <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
+      lib icuin : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
+      lib icuin : : <toolset>msvc <variant>debug <name>icuind <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
+      lib icuin : : <toolset>msvc <variant>release <name>icuin <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
       lib icuin : : <name>this_is_an_invalid_library_name ;
 
       if $(ICU_PATH)
       {
          icuucd_name = [ GLOB $(ICU_PATH)/bin : icuuc??d.dll ] ;
+         if ! $(icuucd_name)
+         {
+            icuucd_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??d.dll ] ;
+         }
          icuuc_name = [ GLOB $(ICU_PATH)/bin : icuuc??.dll ] ;
+         if ! $(icuuc_name)
+         {
+            icuuc_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??.dll ] ;
+         }
          icudt_name = [ GLOB $(ICU_PATH)/bin : icudt??.dll ] ;
+         if ! $(icudt_name)
+         {
+            icudt_name = [ GLOB $(ICU_PATH)/bin64 : icudt??.dll ] ;
+         }
          icuin_name = [ GLOB $(ICU_PATH)/bin : icuin??.dll ] ;
+         if ! $(icuin_name)
+         {
+            icuin_name = [ GLOB $(ICU_PATH)/bin64 : icuin??.dll ] ;
+         }
          icuind_name = [ GLOB $(ICU_PATH)/bin : icuin??d.dll ] ;
+         if ! $(icuind_name)
+         {
+            icuind_name = [ GLOB $(ICU_PATH)/bin64 : icuin??d.dll ] ;
+         }
 
          #ECHO $(icuucd_name:B) $(icuuc_name:B) $(icudt_name:B) $(icuin_name:B) $(icuind_name:B) ;
       }