Author: bonefish Date: 2010-04-20 20:16:07 +0200 (Tue, 20 Apr 2010) New Revision: 36380 Changeset: http://dev.haiku-os.org/changeset/36380/haiku Modified: haiku/trunk/build/jam/OptionalPackages Log: Merged r36378 from r1alpha2 branch back into trunk. Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2010-04-20 17:23:57 UTC (rev 36379) +++ haiku/trunk/build/jam/OptionalPackages 2010-04-20 18:16:07 UTC (rev 36380) @@ -406,14 +406,14 @@ && $(TARGET_ARCH) = x86 { # gcc and binutils if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { - InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip - : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ; + InstallOptionalHaikuImagePackage gcc-2.95.3-r1a2-x86-gcc2-2010-04-20.zip + : $(baseURL)/gcc-2.95.3-r1a2-x86-gcc2-2010-04-20.zip ; } if $(HAIKU_GCC_VERSION[1]) = 2 { # symlink to the appropriate system/lib[/gcc2] folder AddSymlinkToHaikuHybridImage - develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib + develop abi x86 gcc2 tools gcc-2.95.3-haiku-100420 lib : /system/lib libstdc++.r4.so : : true ; }