[haiku-commits] r41974 - haiku/trunk/build/jam
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 6 Jun 2011 19:07:41 +0200 (CEST)
Author: korli
Date: 2011-06-06 19:07:40 +0200 (Mon, 06 Jun 2011)
New Revision: 41974
Changeset: https://dev.haiku-os.org/changeset/41974
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
make DevelopmentJava available for hybrid builds.
+alpha
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2011-06-06 17:05:54 UTC (rev
41973)
+++ haiku/trunk/build/jam/OptionalPackages 2011-06-06 17:07:40 UTC (rev
41974)
@@ -600,7 +600,9 @@
if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package DevelopmentJava available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
+ Echo "No optional package DevelopmentJava available for gcc2" ;
+ } else {
InstallOptionalHaikuImagePackage
gnu-classpath-0.98-x86-gcc4-2011-03-01.zip
: $(baseURL)/gnu-classpath-0.98-x86-gcc4-2011-03-01.zip
;
@@ -611,8 +613,6 @@
InstallOptionalHaikuImagePackage
ecj-3.6.2-haiku-2011-03-05.zip
: $(baseURL)/ecj-3.6.2-haiku-2011-03-05.zip ;
- } else {
- Echo "No optional package DevelopmentJava available for gcc2" ;
}
}
Other related posts:
- » [haiku-commits] r41974 - haiku/trunk/build/jam - korli
