svn commit: r336908 - in head: . share/mk

[Ed Maste]

Author: emaste
Date: Mon Jul 30 14:42:59 2018
New Revision: 336908
URL: https://svnweb.freebsd.org/changeset/base/336908

Log:
  Makefile.libcompat: correctly append to make variable
  
  Reported by:	hselasky
  Pointy hat to:	emaste

Modified:
  head/Makefile.libcompat
  head/share/mk/src.opts.mk

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Mon Jul 30 14:28:00 2018	(r336907)
+++ head/Makefile.libcompat	Mon Jul 30 14:42:59 2018	(r336908)
@@ -130,7 +130,7 @@ LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=
 			-DLIBRARIES_ONLY
 
 _LC_LIBDIRS.yes=		lib
-_LC_LIBDIRS.yes=		gnu/lib
+_LC_LIBDIRS.yes+=		gnu/lib
 _LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
 _LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
 _LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Mon Jul 30 14:28:00 2018	(r336907)
+++ head/share/mk/src.opts.mk	Mon Jul 30 14:42:59 2018	(r336908)
@@ -309,11 +309,8 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
 .else
 __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
 .endif
-.if ${__T} == "aarch64" || ${__T} == "amd64"
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386"
 __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
-.elif ${__T} == "i386"
-__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP
-__DEFAULT_NO_OPTIONS+=LLD_IS_LD
 .else
 __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
 .endif