diff options
author | John Ericson <git@JohnEricson.me> | 2019-07-31 14:10:30 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-12 01:21:32 +0300 |
commit | d8335fb03273d46262b40c0dd53d94ef7e275814 (patch) | |
tree | f386635df7e8e5bbe68d0834aee2618508790b25 | |
parent | b21fd95f737ab96f57c45e15a1d89d5c483daec8 (diff) | |
download | meson-d8335fb03273d46262b40c0dd53d94ef7e275814.zip meson-d8335fb03273d46262b40c0dd53d94ef7e275814.tar.gz meson-d8335fb03273d46262b40c0dd53d94ef7e275814.tar.bz2 |
Put native file before cross file in options list
I think this makes more sense by matching how build comes before host.
Native builds are also more common than cross builds.
-rw-r--r-- | mesonbuild/msetup.py | 8 | ||||
-rwxr-xr-x | run_tests.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 4e6f401..13df6ea 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -32,14 +32,14 @@ from .mesonlib import MesonException def add_arguments(parser): coredata.register_builtin_arguments(parser) - parser.add_argument('--cross-file', - default=[], - action='append', - help='File describing cross compilation environment.') parser.add_argument('--native-file', default=[], action='append', help='File containing overrides for native compilation environment.') + parser.add_argument('--cross-file', + default=[], + action='append', + help='File describing cross compilation environment.') parser.add_argument('-v', '--version', action='version', version=coredata.version) parser.add_argument('--profile-self', action='store_true', dest='profile', diff --git a/run_tests.py b/run_tests.py index 6a42681..7e95643 100755 --- a/run_tests.py +++ b/run_tests.py @@ -71,11 +71,11 @@ class FakeCompilerOptions: def get_fake_options(prefix=''): import argparse opts = argparse.Namespace() + opts.native_file = [] opts.cross_file = None opts.wrap_mode = None opts.prefix = prefix opts.cmd_line_options = {} - opts.native_file = [] return opts def get_fake_env(sdir='', bdir=None, prefix='', opts=None): |