From 01a281bfe1c464df97e87036e361db039acf7d67 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 13 Aug 2021 11:29:17 +0200 Subject: Fix amalgamation discovery logic some more --- libbuild2/file.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libbuild2/file.cxx') diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx index b91de8b..0977895 100644 --- a/libbuild2/file.cxx +++ b/libbuild2/file.cxx @@ -1072,7 +1072,11 @@ namespace build2 // Else fall through. } else - assert (ars == nullptr || simple ()); // Shouldn't we have found it? + { + // Note that here ars may be not NULL. This can happen both when ars + // is a simple project or if out_root is in out directory that has + // no been configured. In this case falling through is what we want. + } } // Do additional checks if the outer root could be our amalgamation. -- cgit v1.1