The build_examples_with_add_subdirectory tasks are failing on the waterfall. The most likely solution is to add a level of indirection in the library linkages (i.e., libbson and libmongoc) similar to what was done in libmongocrypt for its linkage to libbson.