From 540cbcd8e649dad3f34dab637f4227ebcaba524c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 27 Aug 2010 00:57:11 +0000 Subject: [PATCH] * add explicit check against mismatching version of legacy compiler, avoids trying to build the compiler when it's not going to work git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38384 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/scripts/build_cross_tools | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools index 4b8adb916b..d54a9eebbb 100755 --- a/build/scripts/build_cross_tools +++ b/build/scripts/build_cross_tools @@ -28,6 +28,14 @@ if [ ! -d $buildToolsDir ]; then exit 1 fi +if ! grep "$haikuRequiredLegacyGCCVersion" \ + $buildToolsDir/gcc/gcc/version.c >/dev/null 2>&1 ; then + echo "*** Mismatching compiler versions between configure script and" >&2 + echo "*** $buildToolsDir/gcc/gcc/version.c" >&2 + echo "*** Did you perhaps update only one of haiku & buildtools?" >&2 + exit 1 +fi + # create the output dir mkdir -p $haikuOutputDir || exit 1 @@ -139,7 +147,7 @@ sysIncludeDir=$installDir/i586-pc-haiku/sys-include rm -rf $sysIncludeDir/be $sysIncludeDir/posix # remove the objects dir -rm -rf $objDir +#rm -rf $objDir echo "binutils and gcc for cross compilation have been built successfully!"