From 49f8422a0dfa93243c407350a5795fcc6ddcd611 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 14 Jun 2013 16:07:06 +0200 Subject: [PATCH] Remove whole sys-include folder when cross-compiler has been built. * at least for gcc2, we used to leave the 'os' subfolder in there, which may have caused problems when Haiku's headers have changed since the last time the compiler was built. (cherry picked from commit 92bb2fb33e2d0f4aa766be095057fe63ff17bc8e) --- build/scripts/build_cross_tools | 3 +-- build/scripts/build_cross_tools_gcc4 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools index b35bd8107d..9e2fd4edb0 100755 --- a/build/scripts/build_cross_tools +++ b/build/scripts/build_cross_tools @@ -189,8 +189,7 @@ rm -f $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion/inclu # remove the system headers from the installation dir # Only the ones from the source tree should be used. -sysIncludeDir=$installDir/i586-pc-haiku/sys-include -rm -rf $sysIncludeDir/be $sysIncludeDir/posix +rm -rf $installDir/i586-pc-haiku/sys-include # remove the objects dir rm -rf $objDir diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 8e6c732f0d..e22ef70238 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -247,8 +247,7 @@ fi # remove the system headers from the installation dir # Only the ones from the source tree should be used. -sysIncludeDir=$installDir/$haikuMachine/sys-include -rm -rf $sysIncludeDir/os $sysIncludeDir/posix +rm -rf $installDir/$haikuMachine/sys-include # remove the objects dir rm -rf $objDir