Check the presence of the C++ header dir. The native and cross GCC4 do have
different directory layouts and this way we can still use a native compiler as a cross compiler since we don't make the decision based on whether we are cross compiling or not. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29082 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -133,7 +133,14 @@ 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/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion
|
|
||||||
|
local headers
|
||||||
|
if [ -d $gccdir/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion ]; then
|
||||||
|
headers=$gccdir/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion
|
||||||
|
else
|
||||||
|
headers=$gccdir/../../../../include/c++/$haikuGCCVersion
|
||||||
|
fi
|
||||||
|
|
||||||
haikuCxxHeadersDir=$headers
|
haikuCxxHeadersDir=$headers
|
||||||
for d in $haikuGCCMachine backward ext; do
|
for d in $haikuGCCMachine backward ext; do
|
||||||
# Note: We need the line break, otherwise the line might become
|
# Note: We need the line break, otherwise the line might become
|
||||||
|
|||||||
Reference in New Issue
Block a user