From da29e48d137e5bc19046921aea9526906662f4cb Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 13 May 2018 10:36:58 -0400 Subject: mconf: Set prefix first because other options depends on it --- mesonbuild/mconf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/mconf.py') 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 ' % 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() -- cgit v1.1