changeset:   102940:5c77488830bc
user:        doko@ubuntu.com
date:        Mon Aug 29 20:03:25 2016 +0200
files:       configure configure.ac
description:
- Issue #23968, keep platform_triplet and multiarch macros in sync


diff -r 1902e1d79e25 -r 5c77488830bc configure
--- a/configure	Mon Aug 29 17:26:43 2016 +0100
+++ b/configure	Mon Aug 29 20:03:25 2016 +0200
@@ -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 -r 1902e1d79e25 -r 5c77488830bc configure.ac
--- a/configure.ac	Mon Aug 29 17:26:43 2016 +0100
+++ b/configure.ac	Mon Aug 29 20:03:25 2016 +0200
@@ -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