From b45052b60e78ff8373cdef09d8b307148653a0f3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 14 Nov 2016 19:09:41 -0300 Subject: [PATCH] setup: Directly use --werror to set Werror Using mesonconf -Dwerror afterward is failling because of https://github.com/ninja-build/ninja/issues/371 Using meson -Dwerror=true is failing currently for some reason. --- setup | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup b/setup index 2c5d301..3f76857 100755 --- a/setup +++ b/setup @@ -26,8 +26,8 @@ def get_meson(): return accept_command(["meson.py", "meson"]), accept_command(["mesonconf.py", "mesonconf"]) -def get_configs(meson): - return ['-D', 'werror=true'] +def get_configs(): + return ['--werror'] def configure_meson(args, options): @@ -50,8 +50,7 @@ def configure_meson(args, options): os.mkdir(build_dir) try: - subprocess.check_call([sys.executable, meson, "../"] + args, cwd=build_dir) - subprocess.check_call([sys.executable, mesonconf] + get_configs(meson), cwd=build_dir) + subprocess.check_call([sys.executable, meson, "../"] + args + get_configs(), cwd=build_dir) print("\nYou can now build GStreamer and its various subprojects running:\n" " $ ninja -C %s" % build_dir) except subprocess.CalledProcessError as e: -- 2.7.4