]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson.build: change operator combining bools from + to and
authorDan Streetman <ddstreet@canonical.com>
Fri, 3 Sep 2021 16:43:33 +0000 (12:43 -0400)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 4 Sep 2021 00:09:32 +0000 (09:09 +0900)
upstream meson stopped allowing combining boolean with the plus
operator, and now requires using the logical and operator

reference:
https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c

Fixes: #20632
meson.build

index 6e1a8b1e50e7578bd6025651d5f71fda81bbd209..0fe996adba2fe806043d85af023290bf8612a4d6 100644 (file)
@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
 
 want_ossfuzz = get_option('oss-fuzz')
 want_libfuzzer = get_option('llvm-fuzz')
-if want_ossfuzz + want_libfuzzer > 1
+if want_ossfuzz and want_libfuzzer
         error('only one of oss-fuzz or llvm-fuzz can be specified')
 endif