Date: Thu, 7 Nov 2019 23:54:40 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354519 - in head: . share/mk Message-ID: <201911072354.xA7NseBO086072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Nov 7 23:54:40 2019 New Revision: 354519 URL: https://svnweb.freebsd.org/changeset/base/354519 Log: Revert r354518 and commit the intented fix rather than the diagnostic check. This fixes the definition of MK_LIB32 in Makefile.inc1. Modified: head/Makefile.inc1 head/share/mk/src.opts.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Nov 7 23:50:33 2019 (r354518) +++ head/Makefile.inc1 Thu Nov 7 23:54:40 2019 (r354519) @@ -803,7 +803,6 @@ XCFLAGS+= ${BFLAGS} .endif .if ${MK_LIB32} == "yes" -.error WTF _LIBCOMPAT= 32 .include "Makefile.libcompat" .elif ${MK_LIBSOFT} == "yes" Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Thu Nov 7 23:50:33 2019 (r354518) +++ head/share/mk/src.opts.mk Thu Nov 7 23:54:40 2019 (r354519) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911072354.xA7NseBO086072>