From b26135a454392f43127f5d3539dad2e2bf92a462 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 20 Apr 2010 18:16:07 +0000 Subject: [PATCH] Merged r36378 from r1alpha2 branch back into trunk. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36380 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 7bed085b23..1d79f7541c 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -406,14 +406,14 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] && $(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 ; }