Skip to content

C
cpython
Commit ee8e17f9 authored by Mark Dickinson's avatar Mark Dickinson
Browse files
Options

Merge heads

parents 82a95277 75b1cb10
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
configure
View file @ ee8e17f9
...@@ -5395,6 +5395,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then ...@@ -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
......
configure.ac
View file @ ee8e17f9
...@@ -882,6 +882,8 @@ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7