From 47d6e426e2c1ec313f58f70af086b92245944554 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 9 Oct 2010 01:36:12 +0000 Subject: [PATCH] fixed a few issues with the jam rules associated with the gcc-4.4.4 package. * libstdc++.so, libsupc++.so were being created in gcc-4.3.3-haiku-100425/lib * updated the target directory for the headers (from g++/ to c++/) May help with #6701 -- at least #6701#comment:2 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38901 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 00c9c82ab3..48b3e64063 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -528,15 +528,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] } if $(HAIKU_GCC_VERSION[1]) = 4 { - # symlink cpp to g++'s headers + # symlink cpp to c++'s headers AddSymlinkToHaikuHybridImage develop abi x86 gcc4 headers - : ../tools/current/include/g++ : cpp ; + : ../tools/current/include/c++ : cpp ; # symlink to the appropriate system/lib[/gcc4] folder local libs = libstdc++.so libsupc++.so ; for lib in $(libs) { AddSymlinkToHaikuHybridImage - develop abi x86 gcc4 tools gcc-4.3.3-haiku-100425 lib + develop abi x86 gcc4 tools gcc-4.4.4-haiku-100705 lib : /system/lib $(lib) : : true ; } }