From 9feca2b7597047fee3ae44ae6fef2f43851c0be5 Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Tue, 23 Mar 2010 20:03:15 +0000
Subject: [PATCH] Fix libstdc++.r4.so's symlink for GCC 4 Hybrid. Uses an
 repackaged archive of gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip and the
 AddSymlinkToHaikuHybridImage rule. Fixes #5617.

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c289e3428d..5b6e2a311f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -404,8 +404,13 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		&& $(TARGET_ARCH) = x86 {
 	# gcc and binutils
 	if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
-		InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip
-			: $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ;
+		InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip
+			: $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
+		if $(HAIKU_GCC_VERSION[1]) = 2 {
+			AddSymlinkToHaikuHybridImage
+				develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
+				: /system/lib libstdc++.r4.so : : true ;
+		}
 	}
 
 	if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {