From 2cb706444fb66fb4ae419e9224114549ba32d5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 20 Apr 2010 18:44:54 +0000
Subject: [PATCH] * Check HAIKU_ADD_ALTERNATIVE_GCC_LIBS against 1 to allow a
 setting of 0 to   work as usual. * Automatic whitespace cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36382 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage       | 19 ++++++++++---------
 build/jam/OptionalPackages |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 9e157b4953..5c0f6fc7fc 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -165,14 +165,14 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)ati
 ;
 SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
-SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x	
-	$(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 
-	$(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci 
-	$(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 
-	$(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus 
-	$(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900 
+SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
+	$(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2
+	$(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci
+	$(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0
+	$(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus
+	$(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
 	$(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance
-	$(X86_ONLY)vt612x wb840 
+	$(X86_ONLY)vt612x wb840
 
 	# WLAN drivers
 	$(X86_ONLY)aironetwifi $(X86_ONLY)atheroswifi $(X86_ONLY)broadcom43xx
@@ -193,7 +193,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 	local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
 	local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ;
 	if $(archive) {
-		AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) 
+		AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive)
 			: $(extract) ;
 	}
 }
@@ -642,7 +642,8 @@ if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
 # GCC and unzip onto our image. Building the archive is done by a sub-jam.
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ;
 
-if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
+if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
+		&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 	# let another jam build a zip with the system libraries
 	rule InvokeSubJam target : directory : jamLine
 	{
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 1d79f7541c..594d6c3c29 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -6,7 +6,8 @@
 # packages. (It does not matter if a package was built with either compiler,
 # the system should have the respective other system libs.)
 local isHybridBuild ;
-if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
+if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
+		&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 	isHybridBuild = 1 ;
 }
 
@@ -725,7 +726,7 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
 
 
 # MandatoryPackages
-if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] { 
+if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] {
 	# Pseudo package for grouping packages, which are added to all images.
 }