i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes libstdc++.so libsupc++.so's symlink creation on gcc4hybrid. In addition,

Browse Source 
the symlink creation has been also pulled out into its own if block.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35961 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-03-26 19:58:32 +00:00
parent baaa0348a9
commit e13ecedd6b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+9 -6
View File
@@ -406,18 +406,21 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.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 ; : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
if $(HAIKU_GCC_VERSION[1]) = 2 { }
# symlink to the appropriate system/lib[/gcc2] folder
AddSymlinkToHaikuHybridImage if $(HAIKU_GCC_VERSION[1]) = 2 {
develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib # symlink to the appropriate system/lib[/gcc2] folder
: /system/lib libstdc++.r4.so : : true ; 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) { if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip
: $(baseURL)/gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip ; : $(baseURL)/gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip ;
}
if $(HAIKU_GCC_VERSION[1]) = 4 {
# symlink cpp to g++'s headers # symlink cpp to g++'s headers
AddSymlinkToHaikuImage develop abi x86 gcc4 headers AddSymlinkToHaikuImage develop abi x86 gcc4 headers
: ../tools/current/include/g++ : cpp ; : ../tools/current/include/g++ : cpp ;