diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-16 22:32:01 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-26 11:24:20 -0500 |
| commit | 7e1b674704a2afa469797e18fc777ecdd8564b0f (patch) | |
| tree | e3f1a20398158822ae713b7a31cabf01d736e53e /mesonbuild/interpreter.py | |
| parent | bfd190279ca6e8d08917dde0ff22ba33f6162e45 (diff) | |
| download | meson-7e1b674704a2afa469797e18fc777ecdd8564b0f.zip meson-7e1b674704a2afa469797e18fc777ecdd8564b0f.tar.gz meson-7e1b674704a2afa469797e18fc777ecdd8564b0f.tar.bz2 | |
Add both native and cross compiler options to option list.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 3b9f975..ef99511 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1762,12 +1762,12 @@ class Interpreter(): raise InvalidCode('Tried to use unknown language "%s".' % lang) comp.sanity_check(self.environment.get_scratch_dir(), self.environment) self.coredata.compilers[lang] = comp + # Native compiler always exist so always add its options. + new_options = comp.get_options() if cross_comp is not None: cross_comp.sanity_check(self.environment.get_scratch_dir(), self.environment) self.coredata.cross_compilers[lang] = cross_comp - new_options = cross_comp.get_options() - else: - new_options = comp.get_options() + new_options.update(cross_comp.get_options()) optprefix = lang + '_' for i in new_options: if not i.startswith(optprefix): |