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

75b1cb10 · doko@ubuntu.com · 4e1de16f · 75b1cb10 · 75b1cb10
Commit 75b1cb10 authored Aug 29, 2016 by doko@ubuntu.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

configure configure +2 -0

configure.ac configure.ac +2 -0

No files found.
--- 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

--- 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