diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2016-08-29 18:27:43 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2016-08-29 18:27:43 (GMT) |
| commit | ee8e17f901bcb2f94032b82b61ad8b98b6528616 (patch) | |
| tree | 9448c58b71730b54dd168078d7c44c34e64288ad | |
| parent | 82a95277b8f8cb8245abdd14decff9d44d13d25c (diff) | |
| parent | 75b1cb10b53d55cf51f32049ba76a6be82b4f6bb (diff) | |
| download | cpython-ee8e17f901bcb2f94032b82b61ad8b98b6528616.zip cpython-ee8e17f901bcb2f94032b82b61ad8b98b6528616.tar.gz cpython-ee8e17f901bcb2f94032b82b61ad8b98b6528616.tar.bz2 | |
Merge heads
| -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 |