From b25f8906fbbc5f1501ba22fad6520e156c53ef23 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Sat, 19 Sep 2009 19:52:30 +0000
Subject: [PATCH] Fix build on Haiku. Some tools were missing libstdc++ and
 beos-compatible build platforms weren't setting the host compat lib dir at
 all, resulting in the icu build libs not being found.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33190 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/BuildSetup         | 2 +-
 src/tools/icu/gencfu/Jamfile | 1 +
 src/tools/icu/genctd/Jamfile | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index e3b828fe04..322a7b7e44 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -657,7 +657,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 	HOST_LIBROOT = root ;
 	HOST_STATIC_LIBROOT = $(HOST_LIBROOT) ;
 	HOST_LIBBE = be ;
-	HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = ;
+	HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = "export LIBRARY_PATH=$LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)"  ;
 	HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
 } else {
 	HOST_LIBSTDC++ = stdc++ ;
diff --git a/src/tools/icu/gencfu/Jamfile b/src/tools/icu/gencfu/Jamfile
index 8ba6cb94cd..fbcc41d36f 100644
--- a/src/tools/icu/gencfu/Jamfile
+++ b/src/tools/icu/gencfu/Jamfile
@@ -16,5 +16,6 @@ BuildPlatformMain <build>gencfu :
 	<build>libicu-common.so 
 	<build!stub>libicu-data.so
 	$(HOST_LIBSUPC++)
+	$(HOST_LIBSTDC++)
 	$(HOST_LIBROOT)
 	;
diff --git a/src/tools/icu/genctd/Jamfile b/src/tools/icu/genctd/Jamfile
index 4a480cd565..612618ea7d 100644
--- a/src/tools/icu/genctd/Jamfile
+++ b/src/tools/icu/genctd/Jamfile
@@ -16,5 +16,6 @@ BuildPlatformMain <build>genctd :
 	<build>libicu-common.so 
 	<build!stub>libicu-data.so
 	$(HOST_LIBSUPC++)
+	$(HOST_LIBSTDC++)
 	$(HOST_LIBROOT)
 	;