From 4d1e14ecee3049c709c89976826a4280aa59118f Mon Sep 17 00:00:00 2001 From: repo sync Date: Mon, 22 Aug 2011 10:53:24 +0159 Subject: Recognize the gcc version even if it comes from a tarball instead of an unpackaged directory in ../gcc Change-Id: Ic3183d8c7f039700c969e3cf0734210ba184995c --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b9a91b6..35b36f4 100755 --- a/configure +++ b/configure @@ -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 | \ -- cgit v1.2.3