[haiku-commits] haiku: hrev44571 - build/jam
- From: joe.prostko@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 22 Aug 2012 04:29:53 +0200 (CEST)
hrev44571 adds 1 changeset to branch 'master'
old head: 70449c90d95aeea01b25f686d51da4217fe41317
new head: f49d27c7ed6fb197073b3b3ca577c6a9070137bb
----------------------------------------------------------------------------
f49d27c: Allow Puri to be added to GCC2 hybrid builds
[ Joseph R. Prostko <joe.prostko@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44571
Commit: f49d27c7ed6fb197073b3b3ca577c6a9070137bb
URL: http://cgit.haiku-os.org/haiku/commit/?id=f49d27c
Author: Joseph R. Prostko <joe.prostko@xxxxxxxxx>
Date: Wed Aug 22 02:02:52 2012 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 7 deletions(-)
build/jam/OptionalPackages | 12 +++++-------
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index bff3445..b1344e7 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 ;
}
Other related posts:
- » [haiku-commits] haiku: hrev44571 - build/jam - joe . prostko
