[haiku-commits] Re: haiku: hrev44293 - src/apps/webpositive
- From: Matt Madia <mattmadia@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 9 Jul 2012 21:12:06 +0000
On 7/9/12, Ingo Weinhold <ingo_weinhold@xxxxxx> wrote:
> Matt Madia wrote:
>> Here's what I came up with, full patch attached:
>> ==========================================
>> # WebPositive
>> if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
>> if $(TARGET_ARCH) != x86 {
>> Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
>> } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
>> Echo "No optional package WebPositive available for gcc2" ;
>> } else if $(HAIKU_GCC_VERSION[1]) < 4 && $(isHybridBuild) {
>> if $(HAIKU_PRIMARY_GCC) != 4 {
>> # if we are not the gcc4hybrid's sub-jam process
>
> Indeed. This is a gcc 2 hybrid in the main jam with gcc 2.
>
>> AddFilesToAlternativeGCCArchive apps : WebPositive ;
>
> Being the main jam (which builds the image, not the alternative gcc
> archive), this doesn't have any actual effect.
Oh. For some reason, I kept thinking that
AddFilesToAlternativeGCCArchive was needed in the gcc2hybrid section.
> With the simplifications this is pretty much what I had in mind. To sum it
> up, the structure would be:
>
> if ! x86
> fail
> else if gcc 2
> if hybrid
> no op
> else
> fail
> else if gcc 4
> Add*ToHaikuHybridImage
>
> Have you tried it this way?
Just now and it indeed works. :)
Thanks. I'll post a patch on Trac. This way aldeck or anyone else more
familiar with the state of web+ can commit it.
--mmadia
Other related posts:
