From f975dc63f1238bdd4876f891b0ba9eaa255f59f7 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 3 Aug 2013 05:29:15 +0200
Subject: [PATCH] build_cross_tools_gcc4: move sysroot dir into install dir

This allows us to sneak in system include and library search dirs in
haikuporter without doing anything outside the cross tools dir.
---
 build/scripts/build_cross_tools_gcc4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 0a0a695573..74eae6878e 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -109,7 +109,7 @@ objDir=${installDir}-build
 binutilsObjDir=$objDir/binutils
 gccObjDir=$objDir/gcc
 stdcxxObjDir=$objDir/stdcxx
-sysrootDir=$objDir/sysroot
+sysrootDir=$installDir/sysroot
 tmpIncludeDir=$sysrootDir/boot/system/develop/headers
 tmpLibDir=$sysrootDir/boot/system/develop/lib
 
@@ -249,6 +249,9 @@ fi
 # Only the ones from the source tree should be used.
 rm -rf $installDir/$haikuMachine/sys-include
 
+# remove the sysroot dir
+rm -rf $sysrootDir
+
 # remove the objects dir
 rm -rf $objDir