diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-07 23:39:59 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-07 23:43:16 +0300 |
commit | 365f529c75a6b55278db2ee5749d26a29a56fa83 (patch) | |
tree | 777f5a526a9f5753c912bcd73a1204715eab3698 /interpreter.py | |
parent | f88779319d61e316bef8e5b3f9241cf2d80b3e6d (diff) | |
download | meson-365f529c75a6b55278db2ee5749d26a29a56fa83.zip meson-365f529c75a6b55278db2ee5749d26a29a56fa83.tar.gz meson-365f529c75a6b55278db2ee5749d26a29a56fa83.tar.bz2 |
Store build flags into coredata as it is persistent and needs to survive over Meson reconfigurations.
Diffstat (limited to 'interpreter.py')
-rw-r--r-- | interpreter.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/interpreter.py b/interpreter.py index 517335f..fe51c9b 100644 --- a/interpreter.py +++ b/interpreter.py @@ -955,6 +955,11 @@ class Interpreter(): if cross_comp is not None: self.coredata.cross_compilers[lang] = cross_comp mlog.log('Using native %s compiler "' % lang, mlog.bold(' '.join(comp.get_exelist())), '". (%s %s)' % (comp.id, comp.version), sep='') + if not comp.get_language() in self.coredata.external_args: + print('getting from envvars') + (ext_compile_flags, ext_link_flags) = environment.get_flags_from_envvars(comp.get_language()) + self.coredata.external_args[comp.get_language()] = ext_compile_flags + self.coredata.external_link_args[comp.get_language()] = ext_link_flags self.build.add_compiler(comp) if is_cross: mlog.log('Using cross %s compiler "' % lang, mlog.bold(' '.join(cross_comp.get_exelist())), '". (%s %s)' % (cross_comp.id, cross_comp.version), sep='') |