From fbac0185ad37d390cf6a1e36d8cdd35e604581c9 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Sun, 8 Feb 2009 12:47:29 +0000
Subject: [PATCH] * Clean that up a bit and combine the ifs for GCC2/4. * Also
 don't install the GCC2 package on a GCC4 based hybrid, as it's again not  
 usable without proper manual setup.

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 80ce827371..bdd04cde1b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -211,25 +211,28 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
 	AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;
 	AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ;
 
-	if $(HAIKU_GCC_VERSION[1]) > 2 {
-		# gcc 4
-
-		# symlink cpp to g++'s headers
-		AddSymlinkToHaikuImage develop headers
-			: /boot/develop/tools/gnupro/include/g++ : cpp ;
-	} else {
-		# gcc 2.95.3
-
-		AddHeaderDirectoryToHaikuImage cpp ;
-	}
-
-	if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) = 1 {
+	if $(HAIKU_GCC_VERSION[1]) = 2 {
 		# gcc and binutils
 		local baseURL = http://haiku-files.org/files/optional-packages ;
 		InstallOptionalHaikuImagePackage gcc-2.95.3-haiku-081024
 			: $(baseURL)/gcc-2.95.3-haiku-081024.zip
 			:
 		;
+
+		AddHeaderDirectoryToHaikuImage cpp ;
+	}
+
+	if $(HAIKU_GCC_VERSION[1]) = 4 {
+		# gcc and binutils
+		local baseURL = http://haiku.mlotz.ch ;
+		InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129
+			: $(baseURL)/gcc-4.3.3-haiku-090129.zip
+			:
+		;
+
+		# symlink cpp to g++'s headers
+		AddSymlinkToHaikuImage develop headers
+			: /boot/develop/tools/gnupro/include/g++ : cpp ;
 	}
 
 	# other tools
@@ -265,15 +268,6 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
 		: $(baseURL)/texinfo-4.13a-gcc2-2008-11-09.zip
 		:
 	;
-
-	if $(HAIKU_GCC_VERSION[1]) = 4 {
-		# gcc and binutils
-		local baseURL = http://haiku.mlotz.ch ;
-		InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129
-			: $(baseURL)/gcc-4.3.3-haiku-090129.zip
-			:
-		;
-	}
 }