[haiku-commits] Re: r38665 - haiku/trunk/build/jam

  • From: Matt Madia <mattmadia@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 18 Sep 2010 23:09:09 +0000

On Thu, Sep 16, 2010 at 02:34, scott mc <scottmc2@xxxxxxxxx> wrote:
> Author: scottmc
> Date: 2010-09-16 04:34:38 +0200 (Thu, 16 Sep 2010)
> New Revision: 38665
> Changeset: http://dev.haiku-os.org/changeset/38665
>
> Modified:
>   haiku/trunk/build/jam/OptionalPackageDependencies
>   haiku/trunk/build/jam/OptionalPackages
> Log:
> Updated BeAE and added a gcc4 build.
> Added BurnItNow, both a gcc2 and gcc4 build.
> Added Bazaar, both a gcc2 and gcc4 build.
>
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> +       if $(TARGET_ARCH) != x86 {
> +               Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
> +       } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {

I was wondering, why did you use this compound test when there's
individual packages for gcc2 and gcc4?
With the current test, GCC 4 Hybrids will pull the gcc2 package.

> +               InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
> +                       : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
> +                       :
> +               ;
> +       } else {
> +               InstallOptionalHaikuImagePackage 
> bzr-2.2.0-x86-gcc2-2010-09-15.zip


--mmadia

Other related posts: