33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From 7d7562db194f6b521d93ef370176922d0ac68331 Mon Sep 17 00:00:00 2001
|
|
From: Dan Streetman <ddstreet@canonical.com>
|
|
Date: Fri, 3 Sep 2021 12:43:33 -0400
|
|
Subject: [PATCH] meson.build: change operator combining bools from + to and
|
|
|
|
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
|
|
(cherry picked from commit c29537f39e4f413a6cbfe9669fa121bdd6d8b36f)
|
|
|
|
Related: #2017035
|
|
---
|
|
meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index d28f04607a..f21ec5bb94 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -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
|
|
|