From ce658a595dfa8702559667d379a6e5bcfc1ebe33 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 1 Nov 2010 15:37:46 +0000 Subject: [PATCH] Fixed conditional for box2d. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39251 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalLibPackages | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index bee92bf48d..7b203fead2 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -64,15 +64,17 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] { 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" ; + } } }