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

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 72b86b76d7633861709079bf495e105185c793be..d0390985bbe925d6a9ab0bee1de3dacbdfe3f801 100644 (file)
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-13  Ian Lance Taylor  <iant@golang.org>
+
+       PR go/80964
+       * configure.ac: Set NATIVE if host_alias = target_alias.
+       * configure: Rebuild.
+
 2017-05-18  Ian Lance Taylor  <iant@golang.org>
 
        PR go/80814

diff --git a/gotools/configure b/gotools/configure
index d144125c04035f0a4d299782f04da44da68db762..a1addc3b6a94b567fd25e8a126b4deb3568929ef 100755 (executable)
--- 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 fcc6853629686d1f18342f8b7c48f8dd4e6d940f..81afe9ed886165dbf4e929ab433bde958ecb9b65 100644 (file)
--- 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,