[haiku-commits] r38714 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 19 Sep 2010 01:43:48 +0200 (CEST)
Author: scottmc
Date: 2010-09-19 01:43:48 +0200 (Sun, 19 Sep 2010)
New Revision: 38714
Changeset: http://dev.haiku-os.org/changeset/38714
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
Fix the gcc4 conditionals for BeAE, Bazaar and BurnItNow so that they will work
on a ggc4hybrid build correctly.
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-09-18 22:53:04 UTC (rev
38713)
+++ haiku/trunk/build/jam/OptionalPackages 2010-09-18 23:43:48 UTC (rev
38714)
@@ -145,7 +145,7 @@
if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
: $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
:
@@ -163,7 +163,7 @@
if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip
: $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip
:
@@ -326,7 +326,7 @@
if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BurnItNow available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
: $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip
:
Other related posts:
- » [haiku-commits] r38714 - haiku/trunk/build/jam - scott mc
