i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Document that the haikuRequiredLegacyGCCVersion variable is

Browse Source 
influencing this script.
* If haikuRequiredLegacyGCCVersion has not been specified, assume that
  the script was called manually and just use the version string from
  the gcc sources.
* Make error output a bit more consistent.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43163 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2011-11-03 14:22:31 +00:00
parent 360504239c
commit 530590d3b9
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools
+28 -9
View File
@@ -1,6 +1,9 @@
#!/bin/sh #!/bin/sh
# parameters <haiku sourcedir> <buildtools dir> <haiku output dir> # Parameters <haiku sourcedir> <buildtools dir> <haiku output dir>
# Influential environmental variable:
# * haikuRequiredLegacyGCCVersion: The requrired version of the gcc. Will be
# checked against the version in the buildtools directory.
# get and check the parameters # get and check the parameters
if [ $# -lt 3 ]; then if [ $# -lt 3 ]; then
@@ -19,21 +22,37 @@ additionalMakeArgs=$*
if [ ! -d $haikuSourceDir ]; then if [ ! -d $haikuSourceDir ]; then
echo "No such directory: \"$haikuSourceDir\"" >&2 echo "ERROR: No such directory: \"$haikuSourceDir\"" >&2
exit 1 exit 1
fi fi
if [ ! -d $buildToolsDir ]; then if [ ! -d $buildToolsDir ]; then
echo "No such directory: \"$buildToolsDir\"" >&2 echo "ERROR: No such directory: \"$buildToolsDir\"" >&2
exit 1 exit 1
fi fi
if ! grep "$haikuRequiredLegacyGCCVersion" \ # verify or extract the gcc version
$buildToolsDir/gcc/gcc/version.c >/dev/null 2>&1 ; then gccVersionDotC="$buildToolsDir/gcc/gcc/version.c"
echo "*** Mismatching compiler versions between configure script and" >&2 if [ -n "$haikuRequiredLegacyGCCVersion" ]; then
echo "*** $buildToolsDir/gcc/gcc/version.c" >&2 # haikuRequiredLegacyGCCVersion has been specified. Check whether the
echo "*** Did you perhaps update only one of haiku & buildtools?" >&2 # version of the gcc in the given build tools directory matches.
exit 1 if ! grep "$haikuRequiredLegacyGCCVersion" \
"$gccVersionDotC" >/dev/null 2>&1 ; then
echo "*** Mismatching compiler versions between configure script and" \
>&2
echo "*** $gccVersionDotC" >&2
echo "*** Did you perhaps update only one of haiku & buildtools?" >&2
exit 1
fi
else
# haikuRequiredLegacyGCCVersion wasn't specified. Extract the version string
# from the gcc's version.c.
haikuRequiredLegacyGCCVersion=`grep "2.95.3-haiku-" "$gccVersionDotC" \
| sed 's@.*\"\(.*\)\".*@\1@'`
if [ -z "$haikuRequiredLegacyGCCVersion" ]; then
echo "ERROR: Failed to extract version string from $gccVersionDotC" >&2
exit 1
fi
fi fi