From 7bf351fce91fbbc51a155b8de91a2e841648c23e Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Sun, 18 Jul 2010 02:12:16 +0000
Subject: [PATCH] Added a small sanity check for improperly built images. Added
 a TODO about creating the symlinks for gcc-agnostic packages.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37560 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 data/bin/installoptionalpackage | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index d7462e6c07..490978ced9 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -134,6 +134,9 @@ function Exit()
 function InstallOptionalHaikuImagePackage()
 {
 	# InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
+	# 	: isGCCAgnostic
+	# TODO add support for isGCCAgnostic
+
 	# Wrapper for Jam rule
 	echo "Installing \$1 ..."
 	cd \$tmpDir
@@ -384,24 +387,31 @@ function GetBuildFile()
 
 function DetectSystemConfiguration()
 {
-	# Determine which GCC we're running and if we're a hybrid
-	if [ -d "$libDir"/gcc4 ] ; then
-		HAIKU_GCC_VERSION[1]=2
-		isHybridBuild=1
-	elif [ -d "$libDir"/gcc2 ] ; then
+
+	# Determine which GCC we're running
+	if [ -f "$libDir"/libsupc++.so ] ; then
 		HAIKU_GCC_VERSION[1]=4
-		isHybridBuild=1
-	elif [ -f "$libDir"/libsupc++.so ] ; then
-		HAIKU_GCC_VERSION[1]=4
-		isHybridBuild=""
 	else
 		HAIKU_GCC_VERSION[1]=2
+	fi
+
+	# Test for hybrid
+	if [ -d "$libDir"/gcc4 -a -d "$libDir"/gcc2 ]; then
+		echo "Sorry, but your build appears to be broken ..."
+		echo "Both gcc2 and gcc4 subdirs exist."
+		exit 1
+	elif [ -d "$libDir"/gcc4 -o -d "$libDir"/gcc2 ]; then
+		isHybridBuild=1
+	else
 		isHybridBuild=""
 	fi
 
 	# Determine the Architecture.
 	if [ `uname -m` == "BePC" ] ; then
 		TARGET_ARCH='x86'
+	else
+		echo "Sorry, x86 only for now."
+		exit 1
 	fi
 }