svn commit: r340645 - head/tools/build

[Alex Richardson]

Author: arichardson
Date: Mon Nov 19 18:58:34 2018
New Revision: 340645
URL: https://svnweb.freebsd.org/changeset/base/340645

Log:
  Add capsicum_helpers.h to -legacy if needed
  
  This fixes bootstrap of capsicumized strings on FreeBSD 11.
  
  Reviewed By:	oshogbo, bdrewery
  Differential Revision: https://reviews.freebsd.org/D17971

Modified:
  head/tools/build/Makefile

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Mon Nov 19 18:29:03 2018	(r340644)
+++ head/tools/build/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
@@ -48,6 +48,16 @@ INCS+=		strings.h
 SRCS+=		explicit_bzero.c
 .endif
 
+.if exists(/usr/include/capsicum_helpers.h)
+_WITH_CAPH_ENTER!= grep -c caph_enter /usr/include/capsicum_helpers.h || true
+.endif
+.if !defined(_WITH_CAPH_ENTER) || ${_WITH_CAPH_ENTER} == 0
+.PATH: ${SRCTOP}/lib/libcapsicum
+INCS+=		capsicum_helpers.h
+.PATH: ${SRCTOP}/lib/libcasper/libcasper
+INCS+=		libcasper.h
+.endif
+
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif