From 13de873d87fd45913ea391eb5c543fc28d65b8ad Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 8 Mar 2019 18:42:27 -0600
Subject: [PATCH] Work around Boost removing modular include dirs for release.

---
 test/build.jam | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/build.jam b/test/build.jam
index 8ab39c7..e894a31 100644
--- a/test/build.jam
+++ b/test/build.jam
@@ -4,13 +4,23 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 import ../tools/check/predef : require check : predef-require predef-check ;
+import path ;
+
+# This deals with the unfortunate aspect of a Boost monolithic release
+# not having the modular include dirs. This is a kludge that just removes
+# the direct depdndency to the header if it can't find it.
+local PREDEF_H = $(BOOST_PREDEF_INCLUDE)/boost/predef.h ;
+if ! [ path.exists $(PREDEF_H) ]
+{
+    PREDEF_H = ;
+}
 
 project
     :   requirements
         <include>$(BOOST_PREDEF_INCLUDE)
         # Add explicit dependency since we don't have header scanner for
         # .m and .mm files.
-        <dependency>$(BOOST_PREDEF_INCLUDE)/boost/predef.h
+        <dependency>$(PREDEF_H)
     ;
 
 using testing ;