Updated friss's if statements, to allow installation on a gcc2hybrid. In order
to be installed on a GCC 2 Only image, friss would need to be built on gcc2 and provided as a package. Fixes #5962. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36942 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -645,14 +645,14 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
|
|||||||
if [ IsOptionalHaikuImagePackageAdded friss ] {
|
if [ IsOptionalHaikuImagePackageAdded friss ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) != x86 {
|
||||||
Echo "No optional package friss available for $(TARGET_ARCH)" ;
|
Echo "No optional package friss available for $(TARGET_ARCH)" ;
|
||||||
} else if $(HAIKU_GCC_VERSION[1]) = 2 {
|
} else if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
|
||||||
Echo "No optional package friss available for gcc2" ;
|
|
||||||
} else {
|
|
||||||
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
|
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
|
||||||
: http://pulkomandy.ath.cx/projects/friss/export/8/bin/friss-0.5pre7-x86-gcc4.zip
|
: http://pulkomandy.ath.cx/projects/friss/export/8/bin/friss-0.5pre7-x86-gcc4.zip
|
||||||
:
|
:
|
||||||
: true
|
: true
|
||||||
;
|
;
|
||||||
|
} else {
|
||||||
|
Echo "No optional package friss available for gcc2" ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user