From 0ff39fd77b3127c7a250e7f817e34dfaecbcc208 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 20 Nov 2020 22:07:37 +0300
Subject: Add support for buildscript depdb preamble

---
 libbuild2/build/script/script.cxx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'libbuild2/build/script/script.cxx')

diff --git a/libbuild2/build/script/script.cxx b/libbuild2/build/script/script.cxx
index c6b57c3..e003b6a 100644
--- a/libbuild2/build/script/script.cxx
+++ b/libbuild2/build/script/script.cxx
@@ -74,13 +74,20 @@ namespace build2
           assign (var_pool.insert ("<")) = move (ns);
         }
 
-        // Set the $~ special variable.
-        //
         if (temp)
-        {
+          set_temp_dir_variable ();
+      }
+
+      void environment::
+      set_temp_dir_variable ()
+      {
+        // Note that the temporary directory could have been created
+        // implicitly by the runner.
+        //
+        if (temp_dir.path.empty ())
           create_temp_dir ();
-          assign (var_pool.insert<dir_path> ("~")) = temp_dir.path;
-        }
+
+        assign (var_pool.insert<dir_path> ("~")) = temp_dir.path;
       }
 
       void environment::
-- 
cgit v1.1