traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge heads

This commit is contained in:
Mark Dickinson 2016-08-29 19:27:43 +01:00
parent 82a95277b8 75b1cb10b5
commit ee8e17f901
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5395,6 +5395,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; 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 as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5
fi fi
elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
MULTIARCH=$PLATFORM_TRIPLET
fi fi
if test x$PLATFORM_TRIPLET = x; then if test x$PLATFORM_TRIPLET = x; then
PLATDIR=plat-$MACHDEP PLATDIR=plat-$MACHDEP

2
configure.ac
View File

@ -882,6 +882,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
AC_MSG_ERROR([internal configure error for the platform triplet, please file a bug report]) AC_MSG_ERROR([internal configure error for the platform triplet, please file a bug report])
fi fi
elif test x$PLATFORM_TRIPLET != x && test x$MULTIARCH = x; then
MULTIARCH=$PLATFORM_TRIPLET
fi fi
if test x$PLATFORM_TRIPLET = x; then if test x$PLATFORM_TRIPLET = x; then
PLATDIR=plat-$MACHDEP PLATDIR=plat-$MACHDEP