diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2016-08-29 18:03:25 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2016-08-29 18:03:25 (GMT) |
| commit | 75b1cb10b53d55cf51f32049ba76a6be82b4f6bb (patch) | |
| tree | e6dda2f4abd14c032c36e67d9f47b16a013c2309 | |
| parent | 4e1de16f88cd8b99b2d154e647b63f2f6f8b58ae (diff) | |
| download | cpython-75b1cb10b53d55cf51f32049ba76a6be82b4f6bb.zip cpython-75b1cb10b53d55cf51f32049ba76a6be82b4f6bb.tar.gz cpython-75b1cb10b53d55cf51f32049ba76a6be82b4f6bb.tar.bz2 | |
- Issue #23968, keep platform_triplet and multiarch macros in sync
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 64c844d..2e0cb39 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 |