[Haiku-commits] r30875 - in haiku/trunk: . build/jam data/bin data/system/boot src/bin

[Joseph Prostko]

On Tue, May 26, 2009 at 9:12 PM, <bonefish at mail.berlios.de> wrote:
> Author: bonefish
> Date: 2009-05-27 03:12:34 +0200 (Wed, 27 May 2009)
> New Revision: 30875
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30875&view=rev
>

> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages      2009-05-27 00:45:44 UTC (rev 30874)
> +++ haiku/trunk/build/jam/OptionalPackages      2009-05-27 01:12:34 UTC (rev 30875)

> @@ -208,20 +212,32 @@
>  if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
>                && $(TARGET_ARCH) = x86 {
>        # gcc and binutils
> -       if $(HAIKU_GCC_VERSION[1]) = 2 {
> +       if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
>                local baseURL = http://haiku-files.org/files/optional-packages ;
> -               InstallOptionalHaikuImagePackage gcc-2.95.3-haiku-081024
> -                       : $(baseURL)/gcc-2.95.3-haiku-081024.zip ;
> -       } else if $(HAIKU_GCC_VERSION[1]) = 4 {
> -               local baseURL = http://haiku.mlotz.ch ;
> -               InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090313
> -                       : $(baseURL)/gcc-4.3.3-haiku-090313.zip ;
> +               InstallOptionalHaikuImagePackage gcc-2.95.3-haiku-081024-1
> +                       : $(baseURL)/gcc-2.95.3-haiku-081024-1.zip ;
> +       }
>
> +       if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
> +               local baseURL = http://haiku-files.org/files/optional-packages ;
> +               InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090313-1
> +                       : $(baseURL)/gcc-4.3.3-haiku-090313-1.zip ;
> +
>                # symlink cpp to g++'s headers
> -               AddSymlinkToHaikuImage develop headers
> -                       : /boot/develop/tools/gnupro/include/g++ : cpp ;
> +               AddSymlinkToHaikuImage develop abi x86 gcc4 headers
> +                       : ../tools/current/include/g++ : cpp ;
>        }
>
> +       if $(HAIKU_GCC_VERSION[1]) = 4 {
> +               # symlink to libstdc++.so
> +               # TODO: This needs to be solved differently! I.e. the build system
> +               # (configure) should already produce libstdc++.so.
> +               AddSymlinkToHaikuImage system lib
> +                       : /boot/develop/abi/x86/gcc4/tools/current/lib/libstdc++.so ;
> +               AddSymlinkToAlternativeGCCArchive system lib gcc4
> +                       : /boot/develop/abi/x86/gcc4/tools/current/lib/libstdc++.so ;
> +       }
> +
>        # other commonly used tools
>        local baseURL = http://haiku-files.org/files/optional-packages ;
>        InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09

In the above hunk, shouldn't the lines

       if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {

and

       if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {

read as

       if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) = 1 {

and

        if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) = 1 {

respectively?

I tend to do hybrid and pure builds out of the same build directory,
setting HAIKU_ADD_ALTERNATIVE_GCC_LIBS = ; on the profile I do not
want to be hybrid.  With this revision, the alternative GCC gets
downloaded no matter what, since isHybridBuild is set at the beginning
of the file.

- joe