diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2021-08-13 11:29:17 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-08-13 11:29:17 +0200 |
commit | 01a281bfe1c464df97e87036e361db039acf7d67 (patch) | |
tree | fba8d085a34c6a3320718acf5d71b5548095f448 | |
parent | 61ac67105ef31e1ea31014e50e5b6deb74674594 (diff) |
Fix amalgamation discovery logic some more
-rw-r--r-- | libbuild2/file.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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. |