diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d10d2ce..1451429 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2006-05-01 DJ Delorie <dj@redhat.com> + + * configure.ac (gcc_cv_nm): Don't use an in-tree nm if + build!=host. + (gcc_cv_objdump): Likewise. + * configure: Regenerated. + 2006-05-01 Kazu Hirata <kazu@codesourcery.com> PR target/27374 diff --git a/gcc/configure b/gcc/configure index fe6f1bd..113d41c 100755 --- a/gcc/configure +++ b/gcc/configure @@ -13171,7 +13171,8 @@ if test "${gcc_cv_nm+set}" = set; then else if test -f $gcc_cv_binutils_srcdir/configure.in \ - && test -f ../binutils/Makefile; then + && test -f ../binutils/Makefile \ + && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext elif test -x nm$build_exeext; then gcc_cv_nm=./nm$build_exeext @@ -13243,7 +13244,8 @@ if test "${gcc_cv_objdump+set}" = set; then else if test -f $gcc_cv_binutils_srcdir/configure.in \ - && test -f ../binutils/Makefile; then + && test -f ../binutils/Makefile \ + && test x$build = x$host; then # Single tree build which includes binutils. gcc_cv_objdump=../binutils/objdump$build_exeext elif test -x objdump$build_exeext; then diff --git a/gcc/configure.ac b/gcc/configure.ac index 447f827..a055581 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1918,7 +1918,8 @@ fi gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils AS_VAR_SET_IF(gcc_cv_nm,, [ if test -f $gcc_cv_binutils_srcdir/configure.in \ - && test -f ../binutils/Makefile; then + && test -f ../binutils/Makefile \ + && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext elif test -x nm$build_exeext; then gcc_cv_nm=./nm$build_exeext @@ -1944,7 +1945,8 @@ AC_SUBST(ORIGINAL_NM_FOR_TARGET) # Figure out what objdump we will be using. AS_VAR_SET_IF(gcc_cv_objdump,, [ if test -f $gcc_cv_binutils_srcdir/configure.in \ - && test -f ../binutils/Makefile; then + && test -f ../binutils/Makefile \ + && test x$build = x$host; then # Single tree build which includes binutils. gcc_cv_objdump=../binutils/objdump$build_exeext elif test -x objdump$build_exeext; then |