[Python-checkins] cpython (merge default -> default): Merge heads

[mark.dickinson]

https://hg.python.org/cpython/rev/7d73555c83ff
changeset:   102942:7d73555c83ff
parent:      102941:09fa42818cf8
parent:      102940:5c77488830bc
user:        Mark Dickinson <dickinsm at gmail.com>
date:        Mon Aug 29 19:27:43 2016 +0100
summary:
  Merge heads

files:
  configure    |  2 ++
  configure.ac |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5395,6 +5395,8 @@
   if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
     as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5
   fi
+elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
+  MULTIARCH=$PLATFORM_TRIPLET
 fi
 if test x$PLATFORM_TRIPLET = x; then
   PLATDIR=plat-$MACHDEP
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -882,6 +882,8 @@
   if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
     AC_MSG_ERROR([internal configure error for the platform triplet, please file a bug report])
   fi
+elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
+  MULTIARCH=$PLATFORM_TRIPLET
 fi
 if test x$PLATFORM_TRIPLET = x; then
   PLATDIR=plat-$MACHDEP

-- 
Repository URL: https://hg.python.org/cpython