[haiku-commits] r35961 - haiku/trunk/build/jam
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 26 Mar 2010 20:58:32 +0100 (CET)
Author: mmadia
Date: 2010-03-26 20:58:32 +0100 (Fri, 26 Mar 2010)
New Revision: 35961
Changeset: http://dev.haiku-os.org/changeset/35961/haiku
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
Fixes libstdc++.so libsupc++.so's symlink creation on gcc4hybrid. In addition,
the symlink creation has been also pulled out into its own if block.
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-03-26 19:47:23 UTC (rev
35960)
+++ haiku/trunk/build/jam/OptionalPackages 2010-03-26 19:58:32 UTC (rev
35961)
@@ -406,18 +406,21 @@
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 ;
- 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
- : /system/lib libstdc++.r4.so : : true ;
- }
}
+ 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
+ : /system/lib libstdc++.r4.so : : true ;
+ }
+
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage
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
AddSymlinkToHaikuImage develop abi x86 gcc4 headers
: ../tools/current/include/g++ : cpp ;
Other related posts:
- » [haiku-commits] r35961 - haiku/trunk/build/jam - mattmadia
