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

gcc 4 only: modified the previous change to allow fallback to local C++ system headers

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18866 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-09-16 22:25:49 +00:00
parent e3c3c19859
commit 274b450ab8
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+13 -10
View File
@@ -110,16 +110,19 @@ standard_gcc_settings()
haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so` haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a` haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so` haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so`
# only when building a cross compiler use the local (non haiku) C++ headers local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
if [ -n "$buildCrossTools" ]; then haikuCxxHeadersDir=$headers
local headers=$gccdir/../../../../include/c++/$haikuGCCVersion for d in $haikuGCCMachine backward ext; do
haikuCxxHeadersDir=$headers # Note: We need the line break, otherwise the line might become
for d in $haikuGCCMachine backward ext; do # too long for jam (512 bytes max).
# Note: We need the line break, otherwise the line might become haikuCxxHeadersDir="$haikuCxxHeadersDir
# too long for jam (512 bytes max). $headers/$d"
haikuCxxHeadersDir="$haikuCxxHeadersDir done
$headers/$d"
done if [ "$buildCrossTools" = "" ]; then
# when not building the crosscompiler, we use cpp headers from
# tree first, but fallback to local C++ system headers (like <new>)
haikuCxxHeadersDir="headers/cpp $haikuCxxHeadersDir"
fi fi
if [ $haikuStaticLibStdCxx = libstdc++.a ]; then if [ $haikuStaticLibStdCxx = libstdc++.a ]; then