* updated optional package for gcc2 to gcc-2.95.3-x86-gcc2-2010-07-12

(a version that correctly deals with utf-8 chars in wide character literals)
* adjusted required gcc2 version in configure

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37483 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2010-07-12 19:32:24 +00:00
parent 06b318ef9b
commit 7a5c50f900
2 changed files with 4 additions and 4 deletions

View File

@ -462,14 +462,14 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
# gcc and binutils # gcc and binutils
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
gcc-2.95.3-r1a2-x86-gcc2-2010-04-20-1.zip gcc-2.95.3-r1a2-x86-gcc2-2010-07-12.zip
: $(baseURL)/gcc-2.95.3-r1a2-x86-gcc2-2010-04-20-1.zip ; : $(baseURL)/gcc-2.95.3-r1a2-x86-gcc2-2010-07-12.zip ;
} }
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
# symlink to the appropriate system/lib[/gcc2] folder # symlink to the appropriate system/lib[/gcc2] folder
AddSymlinkToHaikuHybridImage AddSymlinkToHaikuHybridImage
develop abi x86 gcc2 tools gcc-2.95.3-haiku-100420 lib develop abi x86 gcc2 tools gcc-2.95.3-haiku-100712 lib
: /system/lib libstdc++.r4.so : : true ; : /system/lib libstdc++.r4.so : : true ;
} }

2
configure vendored
View File

@ -316,7 +316,7 @@ HOST_GCC_OBJCOPY=`gcc -print-prog-name=objcopy`
SFDISK_BINARY=sfdisk SFDISK_BINARY=sfdisk
HOST_SFDISK=$SFDISK_BINARY HOST_SFDISK=$SFDISK_BINARY
haikuRequiredLegacyGCCVersion="2.95.3-haiku-100420" haikuRequiredLegacyGCCVersion="2.95.3-haiku-100712"
export haikuRequiredLegacyGCCVersion export haikuRequiredLegacyGCCVersion
# version of legacy gcc required to build haiku # version of legacy gcc required to build haiku