make DevelopmentJava available for hybrid builds.

+alpha


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41974 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2011-06-06 17:07:40 +00:00
parent 402f023740
commit c2826da6d7

View File

@ -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" ;
}
}