From eb578fec7fd0a044097a44f60e2b2f9137894bea Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 4 Aug 2020 03:43:28 +0000
Subject: [PATCH] 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.
---
 Makefile.inc1 | 4 ++++
 lib/Makefile  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 805a42befb48..94fd5ef5c515 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
diff --git a/lib/Makefile b/lib/Makefile
index 3c29635ffda8..45c10e7e5c57 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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}