summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2024-01-05 15:34:25 (GMT)
committerGitHub <noreply@github.com>2024-01-05 15:34:25 (GMT)
commit5e1916ba1bf521d6ff9d2c553c057f3ef7008977 (patch)
tree0e3cc5859e7251a1d63f9778b0a8f221c60ef9aa
parente56c53334f1adf5b4ea940036c76d18e80fe809d (diff)
downloadcpython-5e1916ba1bf521d6ff9d2c553c057f3ef7008977.zip
cpython-5e1916ba1bf521d6ff9d2c553c057f3ef7008977.tar.gz
cpython-5e1916ba1bf521d6ff9d2c553c057f3ef7008977.tar.bz2
gh-80532: Do not set ipv6type when cross-compiling (#17956)
Co-authored-by: Xavier de Gaye <xdegaye@gmail.com>
-rw-r--r--Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst1
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 3 insertions, 2 deletions
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
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 3cc9aec..b1153df 100755
--- 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 6a80a5d..9587e6d 100644
--- 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