From 4ddd2c75dc73acba4297ea87b383b6504101011a Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 21 Aug 2013 16:30:39 +0200
Subject: [PATCH] Don't try to build xz_utils for a mere gcc2 system.

---
 build/jam/DefaultBuildProfiles | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 59aa2fc5a2..3f2b72fbfd 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -58,9 +58,17 @@ rule DefineDefaultBuildProfiles
 				wonderbrush
 				wqy_microhei
 				xz_utils@!gcc2
-				xz_utils_x86@gcc2
 				;
 
+			# xz_utils can't be built with gcc2, so a mere gcc2 system doesn't
+			# have it. However, xz_utils does exist for the secondary (gcc4)
+			# architecture of a gcc2 hybrid.
+			if $(HAIKU_PACKAGING_ARCHS) != x86_gcc2 {
+				AddHaikuImagePackages
+					xz_utils_x86@gcc2
+					;
+			}
+
 			local architectureObject ;
 			for architectureObject in [ MultiArchSubDirSetup ] {
 				on $(architectureObject) {