- Issue #23968, keep platform_triplet and multiarch macros in sync

diff --git a/configure b/configure
index f5cabadac71a4e8f8ba49adc6e805241db6bec72..0d730451057eeece167d4eb9dd6075ac30308d38 100755 (executable)
--- 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 64c844dc54b8a508a70950921ab739841c2bd02c..2e0cb397ce81aa8475fc7ae0b79309a97523de09 100644 (file)
--- 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