svn commit: r363824 - in head: . lib

[Kyle Evans]

Author: kevans
Date: Tue Aug  4 03:43:28 2020
New Revision: 363824
URL: https://svnweb.freebsd.org/changeset/base/363824

Log:
  Ensure libregex is built in time for googletest
  
  In lib/Makefile, we document the dependency with SUBDIR_DEPEND
  
  For buildworld orchestration, just prebuild libregex if GOOGLETEST is
  enabled. googletest will get built in a later pass.

Modified:
  head/Makefile.inc1
  head/lib/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Aug  4 02:47:24 2020	(r363823)
+++ head/Makefile.inc1	Tue Aug  4 03:43:28 2020	(r363824)
@@ -2741,6 +2741,10 @@ _prebuild_libs+= gnu/lib/libdialog
 gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 .endif
 
+.if ${MK_GOOGLETEST} != "no"
+_prebuild_libs+= lib/libregex
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _prebuild_libs+= lib/libc++
 .endif

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Tue Aug  4 02:47:24 2020	(r363823)
+++ head/lib/Makefile	Tue Aug  4 03:43:28 2020	(r363824)
@@ -107,6 +107,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 # libraries, those libraries should be listed as build order dependencies here.
 
 SUBDIR_DEPEND_geom=	libufs
+SUBDIR_DEPEND_googletest= libregex
 SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd libzstd
 SUBDIR_DEPEND_libauditdm= libbsm
 SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}