svn commit: r297269 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 25 19:12:13 2016
New Revision: 297269
URL: https://svnweb.freebsd.org/changeset/base/297269

Log:
  LIBRARIES_ONLY should only be defined during install32.
  
  r245561 added it to prevent extra files from being installed during
  the install32 phase (to prevent duplicates in the meta log with -DNO_ROOT).
  The flag should not be passed during build32 though since it may
  prevent staging of includes during the 'make includes' phase on
  library directories.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.libcompat

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Fri Mar 25 16:01:40 2016	(r297268)
+++ head/Makefile.libcompat	Fri Mar 25 19:12:13 2016	(r297269)
@@ -79,7 +79,6 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${L
 LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 		CXX="${XCXX} ${LIBCOMPATCFLAGS}" \
 		DESTDIR=${LIBCOMPATTMP} \
-		-DLIBRARIES_ONLY \
 		-DNO_CPU_CFLAGS \
 		MK_CTF=no \
 		-DNO_LINT \
@@ -87,7 +86,8 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCO
 LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MK_MAN=no MK_HTML=no
 LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
-			MK_TOOLCHAIN=no ${IMAKE_INSTALL}
+			MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
+			-DLIBRARIES_ONLY
 
 .if ${XCC:N${CCACHE_BIN}:M/*}
 LIBCOMPATCFLAGS+=	--sysroot=${WORLDTMP}