diff options
| author | Andrei Alexeyev <0x416b617269@gmail.com> | 2018-07-01 19:55:38 +0300 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-01 16:55:38 +0000 |
| commit | f7f5e2a725d63eb15f627713129bb6c22d573106 (patch) | |
| tree | 6202837b2e818b706beca2983abb59f1774e6e79 /mesonbuild/build.py | |
| parent | dc683218a4dbb099d0da1c46e4e7bfe4f19ad9ce (diff) | |
| download | meson-f7f5e2a725d63eb15f627713129bb6c22d573106.zip meson-f7f5e2a725d63eb15f627713129bb6c22d573106.tar.gz meson-f7f5e2a725d63eb15f627713129bb6c22d573106.tar.bz2 | |
Don't let build_always take precedence over build_by_default (#3816)
* Don't let build_always take precedence over build_by_default
* Test for proper interaction of build_by_default with build_always
Fixes #3815
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ec0d8cc..6ee13d2 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1797,7 +1797,8 @@ class CustomTarget(Target): raise InvalidArguments('build_always and build_always_stale are mutually exclusive. Combine build_by_default and build_always_stale.') elif 'build_always' in kwargs: mlog.warning('build_always is deprecated. Combine build_by_default and build_always_stale instead.') - self.build_by_default = kwargs['build_always'] + if 'build_by_default' not in kwargs: + self.build_by_default = kwargs['build_always'] self.build_always_stale = kwargs['build_always'] elif 'build_always_stale' in kwargs: self.build_always_stale = kwargs['build_always_stale'] |