From c2826da6d75eb4d7796f91f68c05f17953f64abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 6 Jun 2011 17:07:40 +0000 Subject: [PATCH] make DevelopmentJava available for hybrid builds. +alpha git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41974 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 07511c3327..ee6764c3a8 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -600,7 +600,9 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] 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 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] { 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" ; } }