From e13ecedd6b28835e30a08a5d82b9c24ad1c1a1ed Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Fri, 26 Mar 2010 19:58:32 +0000
Subject: [PATCH] Fixes libstdc++.so libsupc++.so's symlink creation on
 gcc4hybrid. In addition, the symlink creation has been also pulled out into
 its own if block.

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6fcbcd65b6..93d6bd20b0 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -406,18 +406,21 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 	if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
 		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 {
-			# symlink to the appropriate system/lib[/gcc2] folder
-			AddSymlinkToHaikuHybridImage
-				develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
-				: /system/lib libstdc++.r4.so : : true ;
-		}
+	}
+
+	if $(HAIKU_GCC_VERSION[1]) = 2 {
+		# symlink to the appropriate system/lib[/gcc2] folder
+		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) {
 		InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip
 			: $(baseURL)/gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip ;
+	}
 
+	if $(HAIKU_GCC_VERSION[1]) = 4 {
 		# symlink cpp to g++'s headers
 		AddSymlinkToHaikuImage develop abi x86 gcc4 headers
 			: ../tools/current/include/g++ : cpp ;