gcc 4 only: when not building the cross compiler, use haiku default C++ headers from source tree (haiku/headers/os/cpp), instead of local system headers
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18865 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -110,14 +110,17 @@ 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`
|
||||||
local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
|
# only when building a cross compiler use the local (non haiku) C++ headers
|
||||||
haikuCxxHeadersDir=$headers
|
if [ -n "$buildCrossTools" ]; then
|
||||||
for d in $haikuGCCMachine backward ext; do
|
local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
|
||||||
# Note: We need the line break, otherwise the line might become
|
haikuCxxHeadersDir=$headers
|
||||||
# too long for jam (512 bytes max).
|
for d in $haikuGCCMachine backward ext; do
|
||||||
haikuCxxHeadersDir="$haikuCxxHeadersDir
|
# Note: We need the line break, otherwise the line might become
|
||||||
$headers/$d"
|
# too long for jam (512 bytes max).
|
||||||
done
|
haikuCxxHeadersDir="$haikuCxxHeadersDir
|
||||||
|
$headers/$d"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if [ $haikuStaticLibStdCxx = libstdc++.a ]; then
|
if [ $haikuStaticLibStdCxx = libstdc++.a ]; then
|
||||||
haikuStaticLibStdCxx=
|
haikuStaticLibStdCxx=
|
||||||
|
|||||||
Reference in New Issue
Block a user