Merged r36378 from r1alpha2 branch back into trunk.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36380 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-04-20 18:16:07 +00:00
parent 8fbb8bd5b6
commit b26135a454
+3 -3
View File
@@ -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 ;
}