From 75b1cb10b53d55cf51f32049ba76a6be82b4f6bb Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Mon, 29 Aug 2016 20:03:25 +0200
Subject: [PATCH]  - Issue #23968, keep platform_triplet and multiarch macros
 in sync

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

diff --git a/configure b/configure
index f5cabadac71..0d730451057 100755
--- a/configure
+++ b/configure
@@ -5395,6 +5395,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
   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
index 64c844dc54b..2e0cb397ce8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -882,6 +882,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
   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