From a55f3fb022953626a47066346abbd589652e69be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Sat, 6 Jun 2009 10:35:14 +0000
Subject: [PATCH] Patch by Joe Prostko: Add linking to libstdc++ in some
 places, which is necessary when compiling the code for example with -O1 or
 with the upcomming GCC 4.4. Thanks a lot!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30979 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/cdplayer/Jamfile  | 3 ++-
 src/bin/locale/Jamfile     | 2 +-
 src/kits/bluetooth/Jamfile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/cdplayer/Jamfile b/src/apps/cdplayer/Jamfile
index e87db80e92..401240a1cb 100644
--- a/src/apps/cdplayer/Jamfile
+++ b/src/apps/cdplayer/Jamfile
@@ -13,6 +13,7 @@ Application CDPlayer :
 	TwoStateDrawButton.cpp
 	VolumeSlider.cpp
 
-	: be $(TARGET_SELECT_UNAME_ETC_LIB) $(TARGET_NETAPI_LIB) translation textencoding 
+	: be $(TARGET_SELECT_UNAME_ETC_LIB) $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++)
+		translation textencoding
 	: CDPlayer.rdef
 ;
diff --git a/src/bin/locale/Jamfile b/src/bin/locale/Jamfile
index f58671ccf1..13836e86db 100644
--- a/src/bin/locale/Jamfile
+++ b/src/bin/locale/Jamfile
@@ -6,6 +6,6 @@ UsePublicHeaders locale ;
 
 BinCommand collectcatkeys : collectcatkeys.cpp RegExp.cpp : be liblocale.so ;
 
-BinCommand linkcatkeys : linkcatkeys.cpp : be liblocale.so ;
+BinCommand linkcatkeys : linkcatkeys.cpp : be liblocale.so $(TARGET_LIBSTDC++) ;
 
 BinCommand dumpcatalog : dumpcatalog.cpp : be liblocale.so ;
diff --git a/src/kits/bluetooth/Jamfile b/src/kits/bluetooth/Jamfile
index d6e4e5a5a6..67fc9824f0 100644
--- a/src/kits/bluetooth/Jamfile
+++ b/src/kits/bluetooth/Jamfile
@@ -24,5 +24,5 @@ SharedLibrary libbluetooth.so :
 	#UI
 	PincodeWindow.cpp
 	ConnectionIncoming.cpp
-	: be
+	: be $(TARGET_LIBSTDC++)
 ;