From 2e93295c2e2ed52abd036687d8a6a947b94f213a Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Fri, 27 Mar 2015 23:41:28 +0200
Subject: Generate configure files immediately when they are declared. Closes
 #88.

---
 interpreter.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'interpreter.py')

diff --git a/interpreter.py b/interpreter.py
index 319aeaded..ee8eca7bc 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1412,8 +1412,10 @@ class Interpreter():
 
             conffile = os.path.join(self.subdir, inputfile)
             self.build_def_files.append(conffile)
-            c = ConfigureFileHolder(self.subdir, inputfile, output, conf.held_object)
-            self.build.configure_files.append(c.held_object)
+            os.makedirs(os.path.join(self.environment.build_dir, self.subdir), exist_ok=True)
+            ifile_abs = os.path.join(self.environment.source_dir, self.subdir, inputfile)
+            ofile_abs = os.path.join(self.environment.build_dir, self.subdir, output)
+            mesonlib.do_conf_file(ifile_abs, ofile_abs, conf.held_object)
             conf.mark_used()
         elif 'command' in kwargs:
             res = self.func_run_command(node, kwargs['command'], {})
-- 
cgit v1.2.3