* fixed dependency of build_cross_tools on version of legacy compile, this finally fixes

building of cross-compiler on Linux (as reported by korli, thanks!).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18861 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/scripts/build_cross_tools

@@ -59,8 +59,7 @@ rm -rf $installDir $objDir
 
 mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
-mkdir -p $installDir/lib/gcc-lib/i586-pc-beos/2.95.3-beos-041202
+mkdir -p $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion
-
 
 # build binutils
 cd $binutilsObjDir

configure

@@ -91,10 +91,9 @@ standard_gcc_settings()
 	gcclib=`$HAIKU_CC -print-libgcc-file-name`
 	gccdir=`dirname ${gcclib}`
 
+echo "$HAIKU_CC"
 	haikuGCCVersion=`$HAIKU_CC -dumpversion`
 	haikuGCCMachine=`$HAIKU_CC -dumpmachine`
-	haikuRequiredLegacyGCCVersion="2.95.3-beos-060710"
-		# version of legacy gcc required to build haiku
 	
 	HAIKU_GCC_LIB_DIR=${gccdir}
 	HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
@@ -137,6 +136,7 @@ standard_gcc_settings()
 		2.95*)
 			# check for correct (most up-to-date) legacy compiler and complain
 			# if an older one is installed
+			echo "$haikuGCCVersion != $haikuRequiredLegacyGCCVersion"
 			if [ $haikuGCCVersion != $haikuRequiredLegacyGCCVersion ]; then
 				echo "GCC version $haikuRequiredLegacyGCCVersion is required!";
 				echo "Please download it from www.haiku-os.org...";
@@ -207,6 +207,9 @@ buildCrossTools=
 buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools"
 buildCrossToolsMachine=
 
+export haikuRequiredLegacyGCCVersion="2.95.3-beos-060710"
+	# version of legacy gcc required to build haiku
+
 set_default_value HAIKU_AR			ar
 set_default_value HAIKU_CC			gcc
 set_default_value HAIKU_LD			ld