From b0af0ac0133de0058aae35f3e70fa2b910114ca5 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 30 Jun 2022 07:07:44 +0200 Subject: [PATCH] build: Normalise amd64 CC_MACHINE to x86_64 --- toolchain-detect/configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/toolchain-detect/configure.ac b/toolchain-detect/configure.ac index bf7f8212..84f1a25f 100644 --- a/toolchain-detect/configure.ac +++ b/toolchain-detect/configure.ac @@ -9,6 +9,7 @@ if test -f "$BUILDDIR/$ARCHITECTURE-toolchain.mk"; then fi AC_PROG_GREP +AC_PROG_SED ENFORCE_TOOLCHAIN=no if test "x$TOOLCHAIN" = "x"; then @@ -70,9 +71,13 @@ if ! $LIMINE_CC -dumpmachine >/dev/null 2>&1; then CC_ERROR_MSG fi -CC_MACHINE="$($LIMINE_CC -dumpmachine | dd bs=${#ARCHITECTURE} count=1 2>/dev/null)" +CC_MACHINE="$($LIMINE_CC -dumpmachine | $SED 's/-.*//g')" -if test "x$CC_MACHINE" = "xx86_"; then +if test "x$CC_MACHINE" = "xamd64"; then + CC_MACHINE=x86_64 +fi + +if test "x$CC_MACHINE" = "xx86_64"; then case "$ARCHITECTURE" in i?86) CC_MACHINE="$ARCHITECTURE"