Fix: system-tests: missing space

[lttng-ci.git] / scripts / babeltrace / build.sh

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 8fe9fd8e4ded5dacf26f3fdaa91421a0e18ade81..614062ae72a3162c3e55866946a4dfc86ec4c5ce 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -188,7 +188,7 @@ sol11-i386)
     export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
-macosx)
+macos*)
     export MAKE=make
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"
@@ -252,6 +252,13 @@ export BABELTRACE_MINIMAL_LOG_LEVEL=TRACE
 # Set configure options and environment variables for each build
 # configuration.
 CONF_OPTS=("--prefix=$PREFIX")
+
+# -Werror is enabled by default in stable-2.0 but won't be in 2.1
+# Explicitly disable it for consistency.
+if vergte "$PACKAGE_VERSION" "2.0"; then
+       CONF_OPTS+=("--disable-Werror")
+fi
+
 case "$conf" in
 static)
     echo "Static lib only configuration"