From f49d27c7ed6fb197073b3b3ca577c6a9070137bb Mon Sep 17 00:00:00 2001 From: "Joseph R. Prostko" Date: Tue, 21 Aug 2012 22:02:52 -0400 Subject: [PATCH] Allow Puri to be added to GCC2 hybrid builds --- build/jam/OptionalPackages | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index bff3445056..b1344e7967 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1610,14 +1610,12 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] { if [ IsOptionalHaikuImagePackageAdded Puri ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Puri available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) { + Echo "No optional package Puri for gcc2" ; } else { - if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage - puri-0.3.9.1-x86-gcc4-2012-08-16.zip - : $(baseURL)/puri-0.3.9.1-x86-gcc4-2012-08-16.zip ; - } else { - Echo "No optional package Puri available for gcc2" ; - } + InstallOptionalHaikuImagePackage + puri-0.3.9.1-x86-gcc4-2012-08-16.zip + : $(baseURL)/puri-0.3.9.1-x86-gcc4-2012-08-16.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/Puri/Puri ; }