summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-15 22:52:15 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 00:31:46 +0100
commitef66724def8b14cc93da6c41e5c391e755d4bbd1 (patch)
treed15fe69afef3aa6ff170facbf6440a2b2bde9bd5
parent63bcbcd3f8610bcf5eb99673c2fb62b27565cced (diff)
downloadautowaf-ef66724def8b14cc93da6c41e5c391e755d4bbd1.tar.gz
autowaf-ef66724def8b14cc93da6c41e5c391e755d4bbd1.tar.bz2
autowaf-ef66724def8b14cc93da6c41e5c391e755d4bbd1.zip
Save runtime variables in the environment
-rw-r--r--extras/autowaf.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py
index 00c18c6..e539cd4 100644
--- a/extras/autowaf.py
+++ b/extras/autowaf.py
@@ -4,7 +4,7 @@ import subprocess
import sys
import time
-from waflib import Configure, Build, Context, Logs, Options, Utils
+from waflib import Configure, ConfigSet, Build, Context, Logs, Options, Utils
from waflib.TaskGen import feature, before, after
global g_is_child
@@ -101,6 +101,11 @@ class ConfigureContext(Configure.ConfigurationContext):
def __init__(self, **kwargs):
super(ConfigureContext, self).__init__(**kwargs)
+ self.run_env = ConfigSet.ConfigSet()
+
+ def store(self):
+ self.env.AUTOWAF_RUN_ENV = self.run_env.get_merged_dict()
+ super(ConfigureContext, self).store()
def build_path(self, path='.'):
"""Return `path` within the build directory"""
@@ -482,6 +487,7 @@ def set_lib_env(conf, name, version):
conf.env['LIBPATH_' + NAME] = lib_path
conf.env['LIB_' + NAME] = [lib_name]
+ conf.run_env.append_unique(lib_path_name, lib_path)
conf.define(NAME + '_VERSION', version)
def set_line_just(conf, width):