svn commit: r325085 - head

[Bryan Drewery]

Author: bdrewery
Date: Sun Oct 29 01:21:39 2017
New Revision: 325085
URL: https://svnweb.freebsd.org/changeset/base/325085

Log:
  lib32/libsoft: Store object files in a more consistent structure.
  
  Having objects in world32 and a sysroot in lib32 was confusing and
  inconsistent with the normal build.  Now objects are stored in
  obj-lib32 (or obj-libsoft) and the sysroot (analagous to WORLDTMP)
  is stored in obj-lib32/tmp.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile.libcompat

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Sun Oct 29 01:21:36 2017	(r325084)
+++ head/Makefile.libcompat	Sun Oct 29 01:21:39 2017	(r325085)
@@ -79,8 +79,8 @@ LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
 .endfor
 
 # Shared flags
-LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/world${libcompat}
-LIBCOMPATTMP?=		${OBJTREE}${.CURDIR}/lib${libcompat}
+LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/obj-lib${libcompat}
+LIBCOMPATTMP?=		${LIBCOMPAT_OBJTREE}/tmp
 
 LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 			-L${LIBCOMPATTMP}/usr/lib${libcompat} \