From 55c2583a16791a2f774f7e05e42c9a3c984c8fdd Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 7 Nov 2019 23:54:40 +0000
Subject: [PATCH] Revert r354518 and commit the intented fix rather than the
 diagnostic check.

This fixes the definition of MK_LIB32 in Makefile.inc1.
---
 Makefile.inc1        | 1 -
 share/mk/src.opts.mk | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1b6685313f19..6a858c0f1bc2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -803,7 +803,6 @@ XCFLAGS+=	${BFLAGS}
 .endif
 
 .if ${MK_LIB32} == "yes"
-.error WTF
 _LIBCOMPAT= 32
 .include "Makefile.libcompat"
 .elif ${MK_LIBSOFT} == "yes"
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index d1558df0f6c4..62db35c5f1a9 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -358,8 +358,7 @@ __DEFAULT_NO_OPTIONS+=GDB_LIBEXEC
 __DEFAULT_YES_OPTIONS+=GDB_LIBEXEC
 .endif
 # LIB32 is supported on amd64, mips64, and powerpc64
-.if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH:Mmips64*} || \
-    ${MACHINE_ARCH} == "powerpc64")
+.if (${__T} == "amd64" || ${__T:Mmips64*} || ${__T} == "powerpc64")
 __DEFAULT_YES_OPTIONS+=LIB32
 .else
 BROKEN_OPTIONS+=LIB32