From e2fea9319edd5ccd8e94f8b2c6fd3c7061b923fa Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 13 Jun 2017 19:56:45 +0000 Subject: [PATCH] re PR go/80964 (cross-gotools are not executable on host system) PR go/80964 * configure.ac: Set NATIVE if host_alias = target_alias. * configure: Rebuild. From-SVN: r249172 --- gotools/ChangeLog | 6 ++++++ gotools/configure | 2 +- gotools/configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 72b86b76d76..d0390985bbe 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,9 @@ +2017-06-13 Ian Lance Taylor + + PR go/80964 + * configure.ac: Set NATIVE if host_alias = target_alias. + * configure: Rebuild. + 2017-05-18 Ian Lance Taylor PR go/80814 diff --git a/gotools/configure b/gotools/configure index d144125c040..a1addc3b6a9 100755 --- a/gotools/configure +++ b/gotools/configure @@ -3783,7 +3783,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$cross_compiling" = no; then + if test "$host_alias" = "$target_alias"; then NATIVE_TRUE= NATIVE_FALSE='#' else diff --git a/gotools/configure.ac b/gotools/configure.ac index fcc68536296..81afe9ed886 100644 --- a/gotools/configure.ac +++ b/gotools/configure.ac @@ -46,7 +46,7 @@ AC_PROG_INSTALL AC_PROG_CC AC_PROG_GO -AM_CONDITIONAL(NATIVE, test "$cross_compiling" = no) +AM_CONDITIONAL(NATIVE, test "$host_alias" = "$target_alias") dnl Test for -lsocket and -lnsl. Copied from libjava/configure.ac. AC_CACHE_CHECK([for socket libraries], gotools_cv_lib_sockets, -- 2.30.2