svn commit: r364318 - head/share/mk

[John Baldwin]

Author: jhb
Date: Mon Aug 17 17:17:33 2020
New Revision: 364318
URL: https://svnweb.freebsd.org/changeset/base/364318

Log:
  Move -L${LIBCOMPATTMP}/usr/lib${libcompat} from CFLAGS to LDFLAGS.
  
  This is only needed when linking and fixes various "unused command
  line argument" warnings during the lib32 build.
  
  Reviewed by:	bdrewery
  Obtained from:	CheriBSD
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D26068

Modified:
  head/share/mk/bsd.compat.mk

Modified: head/share/mk/bsd.compat.mk
==============================================================================
--- head/share/mk/bsd.compat.mk	Mon Aug 17 17:14:56 2020	(r364317)
+++ head/share/mk/bsd.compat.mk	Mon Aug 17 17:17:33 2020	(r364318)
@@ -38,7 +38,7 @@ LIB32_MACHINE_ARCH=	i386
 LIB32WMAKEENV=	MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
 		AS="${XAS} --32" \
-		LD="${XLD} -m elf_i386_fbsd -L${LIBCOMPATTMP}/usr/lib32"
+		LD="${XLD} -m elf_i386_fbsd"
 
 .elif ${COMPAT_ARCH} == "powerpc64"
 HAS_COMPAT=32
@@ -146,9 +146,10 @@ LIBCOMPAT_OBJTOP?=	${OBJTOP}/obj-lib${libcompat}
 LIBCOMPATTMP?=		${LIBCOMPAT_OBJTOP}/tmp
 
 LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
-			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
 			--sysroot=${LIBCOMPATTMP} \
 			${BFLAGS}
+
+LIBCOMPATLDFLAGS+=	-L${LIBCOMPATTMP}/usr/lib${libcompat}
 
 LIBCOMPATWMAKEENV+=	MACHINE=${LIBCOMPAT_MACHINE}
 LIBCOMPATWMAKEENV+=	MACHINE_ARCH=${LIBCOMPAT_MACHINE_ARCH}