diff options
| author | repo sync <Bernhard.Rosenkranzer@linaro.org> | 2011-08-22 10:53:24 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-08-22 11:53:33 +0159 |
| commit | 4d1e14ecee3049c709c89976826a4280aa59118f (patch) | |
| tree | 02c8d0e4494f4d910466f51a041b2590249c3ae8 | |
| parent | ffdbe0d735bb0e6415bd218548ca6a54e6e28519 (diff) | |
| download | build-4d1e14ecee3049c709c89976826a4280aa59118f.tar.gz | |
Recognize the gcc version even if it comes from a tarball instead
of an unpackaged directory in ../gcc
Change-Id: Ic3183d8c7f039700c969e3cf0734210ba184995c
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -2331,6 +2331,7 @@ fi # figure out if we need to build gmp and mpfr for gcc 4.3.0+ gcc_version_file="${srcdir}/../gcc/gcc-${GCC_VERSION}/gcc/BASE-VER" +test -f ${gcc_version_file} || gcc_version_file="${srcdir}/temp-src/gcc-${GCC_VERSION}/gcc/BASE-VER" 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 | \ diff --git a/configure.ac b/configure.ac index 257d791..657c4a8 100644 --- a/configure.ac +++ b/configure.ac @@ -291,6 +291,7 @@ ANDROID_CHECK_PACKAGE(gcc-${GCC_VERSION}) # figure out if we need to build gmp and mpfr for gcc 4.3.0+ gcc_version_file="${srcdir}/../gcc/gcc-${GCC_VERSION}/gcc/BASE-VER" +test -f ${gcc_version_file} || gcc_version_file="${srcdir}/temp-src/gcc-${GCC_VERSION}/gcc/BASE-VER" 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 | \ |