[haiku-commits] r35937 - haiku/trunk/build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 23 Mar 2010 21:03:15 +0100 (CET)

Author: mmadia
Date: 2010-03-23 21:03:15 +0100 (Tue, 23 Mar 2010)
New Revision: 35937
Changeset: http://dev.haiku-os.org/changeset/35937/haiku
Ticket: http://dev.haiku-os.org/ticket/5617

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Fix libstdc++.r4.so's symlink for GCC 4 Hybrid. Uses an repackaged archive of 
gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip and the AddSymlinkToHaikuHybridImage 
rule. Fixes #5617.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-03-23 19:22:29 UTC (rev 
35936)
+++ haiku/trunk/build/jam/OptionalPackages      2010-03-23 20:03:15 UTC (rev 
35937)
@@ -404,8 +404,13 @@
                && $(TARGET_ARCH) = x86 {
        # gcc and binutils
        if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
-               InstallOptionalHaikuImagePackage 
gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip
-                       : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ;
+               InstallOptionalHaikuImagePackage 
gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip
+                       : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
+               if $(HAIKU_GCC_VERSION[1]) = 2 {
+                       AddSymlinkToHaikuHybridImage
+                               develop abi x86 gcc2 tools 
gcc-2.95.3-haiku-090629 lib
+                               : /system/lib libstdc++.r4.so : : true ;
+               }
        }
 
        if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {


Other related posts: