[haiku-commits] r39251 - haiku/trunk/build/jam

  • From: scott mc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 1 Nov 2010 16:37:46 +0100 (CET)

Author: scottmc
Date: 2010-11-01 16:37:46 +0100 (Mon, 01 Nov 2010)
New Revision: 39251
Changeset: http://dev.haiku-os.org/changeset/39251

Modified:
   haiku/trunk/build/jam/OptionalLibPackages
Log:
Fixed conditional for box2d.


Modified: haiku/trunk/build/jam/OptionalLibPackages
===================================================================
--- haiku/trunk/build/jam/OptionalLibPackages   2010-11-01 15:24:28 UTC (rev 
39250)
+++ haiku/trunk/build/jam/OptionalLibPackages   2010-11-01 15:37:46 UTC (rev 
39251)
@@ -64,15 +64,17 @@
 if [ IsOptionalHaikuImagePackageAdded box2d ] {
        if $(TARGET_ARCH) != x86 {
                Echo "No optional package box2d available for $(TARGET_ARCH)" ;
-       } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+       } else {
+               if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
                InstallOptionalHaikuImagePackage
                        box2d-2.1.2-x86-gcc4-2010-10-30.zip
                        : $(baselibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip
                        :
                        : true
                ;
-       } else {
-               echo "No optional package box2d available for gcc2" ;
+               } else {
+                       Echo "No optional package box2d available for 
$(TARGET_ARCH)-gcc2" ;
+               }
        }
 }
 


Other related posts: