diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-05-13 10:36:58 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-06 20:02:37 +0000 |
| commit | da29e48d137e5bc19046921aea9526906662f4cb (patch) | |
| tree | 320431e5e517de0ea3c712d62e5afb29c79e4281 /mesonbuild/mconf.py | |
| parent | 00414a326a344410392235941202bb922d704fb2 (diff) | |
| download | meson-da29e48d137e5bc19046921aea9526906662f4cb.zip meson-da29e48d137e5bc19046921aea9526906662f4cb.tar.gz meson-da29e48d137e5bc19046921aea9526906662f4cb.tar.bz2 | |
mconf: Set prefix first because other options depends on it
Diffstat (limited to 'mesonbuild/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 0b33ba3..9932aa0 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -189,7 +189,7 @@ def run(args): if not args: args = [os.getcwd()] options = buildparser().parse_args(args) - coredata.filter_builtin_options(options, args) + coredata.parse_cmd_line_options(options, args) if len(options.directory) > 1: print('%s <build directory>' % args[0]) print('If you omit the build directory, the current directory is substituted.') @@ -201,8 +201,8 @@ def run(args): try: c = Conf(builddir) save = False - if len(options.projectoptions) > 0: - c.set_options(options.projectoptions) + if len(options.cmd_line_options) > 0: + c.set_options(options.cmd_line_options) save = True elif options.clearcache: c.clear_cache() |