diff options
author | Luse Cheng <luse@0xlab.org> | 2011-03-23 14:53:23 +0800 |
---|---|---|
committer | Luse Cheng <luse@0xlab.org> | 2011-03-23 15:35:51 +0800 |
commit | 0b2cc1f78f220061012f4013faa94fdd416e41c3 (patch) | |
tree | 2f94be68c4e93bed468fba8bc365ba3616175e25 | |
parent | 96c921062576e41760326d0b24753f9ba1c32278 (diff) | |
download | build-0b2cc1f78f220061012f4013faa94fdd416e41c3.tar.gz |
Allow building toolchain without target gdb alternatively.
Change-Id: I3fd1c4f628c221e6ae4f939aab73e69b3e546bd1
-rw-r--r-- | Makefile.in | 6 | ||||
-rwxr-xr-x | configure | 32 | ||||
-rw-r--r-- | configure.ac | 4 |
3 files changed, 24 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 0586e63..b1b7605 100644 --- a/Makefile.in +++ b/Makefile.in @@ -518,6 +518,11 @@ install-host-mpc: stmp-install-host-mpc # target gdb rules .PHONY: config-target-gdb build-target-gdb install-target-gdb +ifeq ($(GDB_VERSION),gdb-none) +config-target-gdb: +build-target-gdb: +install-target-gdb: +else config-target-gdb: stmp-config-target-gdb GDB_CONFIG_ARGS=$(baseargs) --prefix=$(prefix) \ @@ -539,6 +544,7 @@ stmp-build-target-gdb: stmp-config-target-gdb install-target-gdb: stmp-build-target-gdb ($(canadian_env) \ $(MAKE) -C ${GDB_VERSION} install) +endif # clean rules .PHONY: clean @@ -1598,8 +1598,8 @@ fi; echo "$as_me:$LINENO: result: $BINUTILS_VERSION" >&5 echo "${ECHO_T}$BINUTILS_VERSION" >&6 -x=binutils-${BINUTILS_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/binutils-${BINUTILS_VERSION} ; then +x=binutils-${BINUTILS_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/binutils-${BINUTILS_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/binutils-${BINUTILS_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/binutils-${BINUTILS_VERSION}.tar elif test -f $srcdir/../$tool/binutils-${BINUTILS_VERSION}.tar.gz ; then @@ -1642,8 +1642,8 @@ echo "${ECHO_T}$GOLD_VERSION" >&6 # Skip check if we are using the main binutils for gold. if test x"$GOLD_VERSION" != x"$BINUTILS_VERSION" ; then - x=binutils-${GOLD_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/binutils-${GOLD_VERSION} ; then + x=binutils-${GOLD_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/binutils-${GOLD_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/binutils-${GOLD_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/binutils-${GOLD_VERSION}.tar elif test -f $srcdir/../$tool/binutils-${GOLD_VERSION}.tar.gz ; then @@ -1684,8 +1684,8 @@ fi; echo "$as_me:$LINENO: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 -x=gcc-${GCC_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/gcc-${GCC_VERSION} ; then +x=gcc-${GCC_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/gcc-${GCC_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/gcc-${GCC_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/gcc-${GCC_VERSION}.tar elif test -f $srcdir/../$tool/gcc-${GCC_VERSION}.tar.gz ; then @@ -1753,8 +1753,8 @@ fi; echo "$as_me:$LINENO: result: $NEWLIB_VERSION" >&5 echo "${ECHO_T}$NEWLIB_VERSION" >&6 -x=newlib-${NEWLIB_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/newlib-${NEWLIB_VERSION} ; then +x=newlib-${NEWLIB_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/newlib-${NEWLIB_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/newlib-${NEWLIB_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/newlib-${NEWLIB_VERSION}.tar elif test -f $srcdir/../$tool/newlib-${NEWLIB_VERSION}.tar.gz ; then @@ -1796,8 +1796,8 @@ else fi; echo "$as_me:$LINENO: result: $GMP_VERSION" >&5 echo "${ECHO_T}$GMP_VERSION" >&6 -x=gmp-${GMP_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/gmp-${GMP_VERSION} ; then +x=gmp-${GMP_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/gmp-${GMP_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/gmp-${GMP_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/gmp-${GMP_VERSION}.tar elif test -f $srcdir/../$tool/gmp-${GMP_VERSION}.tar.gz ; then @@ -1837,8 +1837,8 @@ else fi; echo "$as_me:$LINENO: result: $MPFR_VERSION" >&5 echo "${ECHO_T}$MPFR_VERSION" >&6 -x=mpfr-${MPFR_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/mpfr-${MPFR_VERSION} ; then +x=mpfr-${MPFR_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/mpfr-${MPFR_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/mpfr-${MPFR_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/mpfr-${MPFR_VERSION}.tar elif test -f $srcdir/../$tool/mpfr-${MPFR_VERSION}.tar.gz ; then @@ -1883,8 +1883,8 @@ else fi; echo "$as_me:$LINENO: result: $MPC_VERSION" >&5 echo "${ECHO_T}$MPC_VERSION" >&6 -x=mpc-${MPC_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/mpc-${MPC_VERSION} ; then +x=mpc-${MPC_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/mpc-${MPC_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/mpc-${MPC_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/mpc-${MPC_VERSION}.tar elif test -f $srcdir/../$tool/mpc-${MPC_VERSION}.tar.gz ; then @@ -1926,8 +1926,8 @@ fi; echo "$as_me:$LINENO: result: $GDB_VERSION" >&5 echo "${ECHO_T}$GDB_VERSION" >&6 -x=gdb-${GDB_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/gdb-${GDB_VERSION} ; then +x=gdb-${GDB_VERSION}; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[^-]*-//'); \ +if test \( ! -d $srcdir/../$tool/gdb-${GDB_VERSION} \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/gdb-${GDB_VERSION}.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/gdb-${GDB_VERSION}.tar elif test -f $srcdir/../$tool/gdb-${GDB_VERSION}.tar.gz ; then diff --git a/configure.ac b/configure.ac index fba2a3c..3de117e 100644 --- a/configure.ac +++ b/configure.ac @@ -208,8 +208,8 @@ AC_SUBST(package_to_srcdir) # 4. tool/x.tar.bz2 m4_pattern_allow([^AC_MSG_ERROR$]) AC_DEFUN([ANDROID_CHECK_PACKAGE], -[x=$1; tool=$(echo "$x" | sed -e 's/-.*//'); \ -if test ! -d $srcdir/../$tool/$1 ; then +[x=$1; tool=$(echo "$x" | sed -e 's/-.*//'); version=$(echo "$x" | sed -e 's/[[^-]]*-//'); \ +if test \( ! -d $srcdir/../$tool/$1 \) -a \( x"$version" != x"none" \) ; then if test -f $srcdir/../$tool/$1.tar ; then mkdir -p temp-src && tar -C temp-src -xf $srcdir/../$tool/$1.tar elif test -f $srcdir/../$tool/$1.tar.gz ; then |