Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Aug 2018 09:35:57 +0000 (UTC)
From:      Alex Richardson <arichardson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r338129 - head/tools/build/mk
Message-ID:  <201808210935.w7L9ZvBK014426@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arichardson
Date: Tue Aug 21 09:35:56 2018
New Revision: 338129
URL: https://svnweb.freebsd.org/changeset/base/338129

Log:
  Fix -DWITHOUT_AUTO_OBJ build of rescue after r338096
  
  Approved By:	jhb (mentor)

Modified:
  head/tools/build/mk/Makefile.boot

Modified: head/tools/build/mk/Makefile.boot
==============================================================================
--- head/tools/build/mk/Makefile.boot	Tue Aug 21 03:45:09 2018	(r338128)
+++ head/tools/build/mk/Makefile.boot	Tue Aug 21 09:35:56 2018	(r338129)
@@ -8,6 +8,7 @@ LDFLAGS+=	-L${WORLDTMP}/legacy/usr/lib
 # we do not want to capture dependencies referring to the above
 UPDATE_DEPENDFILE= no
 
+.if !make(obj)
 # When building host tools we should never pull in headers from the source sys
 # directory to avoid any ABI issues that might cause the built binary to crash.
 # The only exceptions to this are sys/cddl/compat for dtrace bootstrap tools and
@@ -23,4 +24,5 @@ UPDATE_DEPENDFILE= no
 .error Do not include $${SRCTOP}/include when building bootstrap tools. \
     Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile instead. \
     Error was caused by Makefile in ${.CURDIR}
+.endif
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808210935.w7L9ZvBK014426>