Force creation of output directory before opening depdb

1 files changed, 15 insertions, 1 deletions

diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx
index 015d538..2d42cbc 100644
--- a/build2/cxx/compile.cxx
+++ b/build2/cxx/compile.cxx
@@ -77,7 +77,7 @@ namespace build2
 
       // Inject dependency on the output directory.
       //
-      inject_parent_fsdir (a, t);
+      fsdir* dir (inject_parent_fsdir (a, t));
 
       // Search and match all the existing prerequisites. The injection
       // code (below) takes care of the ones it is adding.
@@ -143,6 +143,20 @@ namespace build2
           dynamic_cast<cxx&> (
             mr.target != nullptr ? *mr.target : *mr.prerequisite->target));
 
+        // Make sure the output directory exists.
+        //
+        // Is this the right thing to do? It does smell a bit, but then we do
+        // worse things in inject_prerequisites() below. There is also no way
+        // to postpone this until update since we need to extract and inject
+        // header dependencies now (we don't want to be calling search() and
+        // match() in update), which means we need to cache them now as well.
+        // So the only alternative, it seems, is to cache the updates to the
+        // database until later which will sure complicate (and slow down)
+        // things.
+        //
+        if (dir != nullptr)
+          execute_direct (a, *dir);
+
         depdb dd (t.path () + ".d");
 
         // First should come the rule name/version.