diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-04 23:06:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 23:06:46 +0100 |
| commit | 902aaf2ce67a8a2a21580685673400f675bf28c1 (patch) | |
| tree | 7216a78552e80289ba5ee5f55c638ecb67caec66 /mesonbuild/mconf.py | |
| parent | 59791fc56966901038aaaac23942bc8ac6e11494 (diff) | |
| parent | 19f81d3e33c70c9c902dabaad732e5d33bf05bd4 (diff) | |
| download | meson-902aaf2ce67a8a2a21580685673400f675bf28c1.zip meson-902aaf2ce67a8a2a21580685673400f675bf28c1.tar.gz meson-902aaf2ce67a8a2a21580685673400f675bf28c1.tar.bz2 | |
Merge pull request #4626 from Ericson2314/consolidate-properties
Go through coreutils.compiler_options.{build.host.target}
Diffstat (limited to 'mesonbuild/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index b8fb3c6..48f88e8 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -139,7 +139,8 @@ class Conf: self.print_options('Core options', core_options) self.print_options('Backend options', self.coredata.backend_options) self.print_options('Base options', self.coredata.base_options) - self.print_options('Compiler options', self.coredata.compiler_options) + # TODO others + self.print_options('Compiler options', self.coredata.compiler_options.build) self.print_options('Directories', dir_options) self.print_options('Project options', self.coredata.user_options) self.print_options('Testing options', test_options) @@ -154,6 +155,9 @@ def run(options): save = False if len(options.cmd_line_options) > 0: c.set_options(options.cmd_line_options) + if not c.build.environment.is_cross_build(): + # TODO think about cross and command-line interface. + c.coredata.compiler_options.host = c.coredata.compiler_options.build coredata.update_cmd_line_file(builddir, options) save = True elif options.clearcache: |