i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Check HAIKU_ADD_ALTERNATIVE_GCC_LIBS against 1 to allow a setting of 0 to

Browse Source 
work as usual.
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36382 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-20 18:44:54 +00:00
parent 089cfbf774
commit 2cb706444f
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+10 -9
View File
@@ -165,14 +165,14 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
$(X86_ONLY)ati $(X86_ONLY)ati
; ;
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ; SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
$(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2
$(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci
$(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0
$(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus
$(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900 $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
$(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance $(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance
$(X86_ONLY)vt612x wb840 $(X86_ONLY)vt612x wb840
# WLAN drivers # WLAN drivers
$(X86_ONLY)aironetwifi $(X86_ONLY)atheroswifi $(X86_ONLY)broadcom43xx $(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 archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ; local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ;
if $(archive) { if $(archive) {
AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive)
: $(extract) ; : $(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. # GCC and unzip onto our image. Building the archive is done by a sub-jam.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ; 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 # let another jam build a zip with the system libraries
rule InvokeSubJam target : directory : jamLine rule InvokeSubJam target : directory : jamLine
{ {
build/jam/OptionalPackages
+3 -2
View File
@@ -6,7 +6,8 @@
# packages. (It does not matter if a package was built with either compiler, # packages. (It does not matter if a package was built with either compiler,
# the system should have the respective other system libs.) # the system should have the respective other system libs.)
local isHybridBuild ; 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 ; isHybridBuild = 1 ;
} }
@@ -725,7 +726,7 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
# MandatoryPackages # MandatoryPackages
if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] { if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] {
# Pseudo package for grouping packages, which are added to all images. # Pseudo package for grouping packages, which are added to all images.
} }