gh-80532: Do not set ipv6type when cross-compiling (#17956)

Co-authored-by: Xavier de Gaye <xdegaye@gmail.com>

diff --git a/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst b/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst
new file mode 100644 (file)
index 0000000..d3cfbfc
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst
@@ -0,0 +1 @@
+Do not set ipv6type when cross-compiling.

diff --git a/configure b/configure
index 3cc9aecafad13e2f27dd8a2920265eb12a6718c3..b1153df4d7ec523ab909f466298eab3e14eafca1 100755 (executable)
--- a/configure
+++ b/configure
@@ -16538,7 +16538,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
 printf %s "checking ipv6 stack type... " >&6; }
        for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;

diff --git a/configure.ac b/configure.ac
index 6a80a5d29a04ef345f2f035a9f9d35bb91b6c366..9587e6d63499aace3db1ded81c5446774165b02a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4367,7 +4367,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
        AC_MSG_CHECKING([ipv6 stack type])
        for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
        do