diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-08-05 03:45:05 +0159 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-08-05 03:45:05 +0159 |
commit | 814fa749d98aa7f13feaa16624edf7fd49ad5599 (patch) | |
tree | 1cd2093f67b39ccb0222481a7e04c3e85c1488f4 | |
parent | b1f50c5ed8239216676f0bf31e5d50504bf3be9e (diff) | |
download | build-814fa749d98aa7f13feaa16624edf7fd49ad5599.tar.gz |
Be a bit more verbose (should help figure out why the build server
thinks we're building 4.5 even if we're building 4.6)
-rwxr-xr-x | configure | 24 | ||||
-rw-r--r-- | configure.ac | 12 |
2 files changed, 33 insertions, 3 deletions
@@ -2335,29 +2335,45 @@ if test -f "${gcc_version_file}"; then GCC_MAJOR=`head -n 1 $gcc_version_file | sed -e "s/[^0-9].*//"` GCC_MINOR=`head -n 1 $gcc_version_file | \ sed -e "s/^[0-9]*\.//" -e "s/[^0-9].*//"` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0" >&5 +$as_echo_n "checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0... " >&6; } if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 3 \) ; then GCC_MIN_VERSION_4_3_0="yes" else GCC_MIN_VERSION_4_3_0="no" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_MIN_VERSION_4_3_0" >&5 +$as_echo "$GCC_MIN_VERSION_4_3_0" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0" >&5 +$as_echo_n "checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0... " >&6; } if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 5 \) ; then GCC_MIN_VERSION_4_5_0="yes" else GCC_MIN_VERSION_4_5_0="no" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_MIN_VERSION_4_5_0" >&5 +$as_echo "$GCC_MIN_VERSION_4_5_0" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0" >&5 +$as_echo_n "checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0... " >&6; } if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 6 \) ; then GCC_MIN_VERSION_4_6_0="yes" else GCC_MIN_VERSION_4_6_0="no" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_MIN_VERSION_4_6_0" >&5 +$as_echo "$GCC_MIN_VERSION_4_6_0" >&6; } else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0" >&5 +$as_echo_n "checking if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0... " >&6; } # No version file, assume it is trunk GCC_MIN_VERSION_4_3_0="yes" GCC_MIN_VERSION_4_5_0="yes" GCC_MIN_VERSION_4_6_0="yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no version file, assuming yes" >&5 +$as_echo "no version file, assuming yes" >&6; } fi @@ -2587,16 +2603,20 @@ else CLOOG_VERSION="default" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOOG_VERSION" >&5 +$as_echo "$CLOOG_VERSION" >&6; } if test "$CLOOG_VERSION" = "default"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Which version of cloog to build under gcc 4.6+ condition $GCC_MIN_VERSION_4_6_0" >&5 +$as_echo_n "checking Which version of cloog to build under gcc 4.6+ condition $GCC_MIN_VERSION_4_6_0... " >&6; } # Default is 0.15.9 for gcc 4.5 and below, 0.16.3 for gcc 4.6 and higher if test "$GCC_MIN_VERSION_4_6_0" == "yes"; then CLOOG_VERSION="0.16.3" else CLOOG_VERSION="0.15.9" fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOOG_VERSION" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOOG_VERSION" >&5 $as_echo "$CLOOG_VERSION" >&6; } +fi case $CLOOG_VERSION in 0.15*) # CLooG/PPL relies on the PPL for version 0.15.x diff --git a/configure.ac b/configure.ac index d2971ae..87184cf 100644 --- a/configure.ac +++ b/configure.ac @@ -295,29 +295,37 @@ if test -f "${gcc_version_file}"; then GCC_MAJOR=`head -n 1 $gcc_version_file | sed -e "s/[[^0-9]].*//"` GCC_MINOR=`head -n 1 $gcc_version_file | \ sed -e "s/^[[0-9]]*\.//" -e "s/[[^0-9]].*//"` + AC_MSG_CHECKING([if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0]) if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 3 \) ; then GCC_MIN_VERSION_4_3_0="yes" else GCC_MIN_VERSION_4_3_0="no" fi + AC_MSG_RESULT([$GCC_MIN_VERSION_4_3_0]) + AC_MSG_CHECKING([if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0]) if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 5 \) ; then GCC_MIN_VERSION_4_5_0="yes" else GCC_MIN_VERSION_4_5_0="no" fi + AC_MSG_RESULT([$GCC_MIN_VERSION_4_5_0]) + AC_MSG_CHECKING([if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0]) if test "$GCC_MAJOR" -gt 4 -o \ \( "$GCC_MAJOR" -eq 4 -a "$GCC_MINOR" -ge 6 \) ; then GCC_MIN_VERSION_4_6_0="yes" else GCC_MIN_VERSION_4_6_0="no" fi + AC_MSG_RESULT([$GCC_MIN_VERSION_4_6_0]) else + AC_MSG_CHECKING([if gcc $GCC_MAJOR . $GCC_MINOR is at least 4.3.0]) # No version file, assume it is trunk GCC_MIN_VERSION_4_3_0="yes" GCC_MIN_VERSION_4_5_0="yes" GCC_MIN_VERSION_4_6_0="yes" + AC_MSG_RESULT([no version file, assuming yes]) fi AC_SUBST(GCC_MIN_VERSION_4_3_0) AC_SUBST(GCC_MIN_VERSION_4_5_0) @@ -413,15 +421,17 @@ AC_ARG_WITH([cloog-version], CLOOG_VERSION="$withval" fi], [CLOOG_VERSION="default"]) +AC_MSG_RESULT($CLOOG_VERSION) if test "$CLOOG_VERSION" = "default"; then + AC_MSG_CHECKING([Which version of cloog to build under gcc 4.6+ condition $GCC_MIN_VERSION_4_6_0]) # Default is 0.15.9 for gcc 4.5 and below, 0.16.3 for gcc 4.6 and higher if test "$GCC_MIN_VERSION_4_6_0" == "yes"; then CLOOG_VERSION="0.16.3" else CLOOG_VERSION="0.15.9" fi + AC_MSG_RESULT([$CLOOG_VERSION]) fi -AC_MSG_RESULT($CLOOG_VERSION) case $CLOOG_VERSION in 0.15*) # CLooG/PPL relies on the PPL for version 0.15.x |