From eb9907fc9eb2e4de5a076356f3f910483c1962c9 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 3 Mar 2010 21:44:12 +0000
Subject: [PATCH] Fixing #5518: * applied Matt's patch (somewhat changed) that
 corrects the links for gcc4's   libstdc++.so and libsupc++.so in case of a
 gcc2 hybrid (they must point   to /system/lib/gcc4/... instead of
 /system/lib/...)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35746 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/OptionalPackages | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 48ec967db6..ef14c5b40e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -400,6 +400,14 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		# symlink cpp to g++'s headers
 		AddSymlinkToHaikuImage develop abi x86 gcc4 headers
 			: ../tools/current/include/g++ : cpp ;
+
+		# symlink to the appropriate system/lib[/gcc4] folder
+		local libs = libstdc++.so libsupc++.so ;
+		for lib in $(libs) {
+			AddSymlinkToHaikuHybridImage
+				develop abi x86 gcc4 tools gcc-4.3.3-haiku-090629 lib
+				: /system/lib $(lib) : : true ;
+		}
 	}
 
 	# other commonly used tools