d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r354518 and commit the intented fix rather than the diagnostic

Browse Source 
check.

This fixes the definition of MK_LIB32 in Makefile.inc1.
This commit is contained in:
Brooks Davis 2019-11-07 23:54:40 +00:00
parent 99519f2120
commit 55c2583a16
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354519
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.inc1
View File

@ -803,7 +803,6 @@ XCFLAGS+= ${BFLAGS}
.endif
.if ${MK_LIB32} == "yes"
.error WTF
_LIBCOMPAT= 32
.include "Makefile.libcompat"
.elif ${MK_LIBSOFT} == "yes"

3
share/mk/src.opts.mk
View File

@ -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