X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=b54b6fc0943e04e9683daed12e0a807f7663f9a5;hb=9a07183cc9c8aa389f227c4455b8e33c3a386837;hp=a41fbfb3d76d4b9741cc9baa4ef43a55dda6bc40;hpb=d51c467aa776f8cb13866b212787301954b9fe7d;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index a41fbfb..b54b6fc 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -151,6 +151,7 @@ export BABELTRACE_PLUGIN_PATH="$DEPS_LIB/babeltrace2/plugins/"
 export LIBBABELTRACE2_PLUGIN_PROVIDER_DIR="$DEPS_LIB/babeltrace2/plugin-providers/"
 
 export CFLAGS="-g -O2"
+export CXXFLAGS="-g -O2"
 
 # Set compiler variables
 case "$cc" in
@@ -274,14 +275,21 @@ cygwin|cygwin64|msys32|msys64)
     PYTHON2=python2
     PYTHON3=python3
 
-    P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])")
-    P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+    P2_VERSION=$($PYTHON2 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
+    P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
     DEPS_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
     DEPS_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"
     ;;
 esac
 
+# The missing-field-initializers warning code is very dumb in GCC 4.8 on
+# SLES12, disable it even if it's available.
+if [ "$arch" = "sles12sp5" ]; then
+	CFLAGS="$CFLAGS -Wno-missing-field-initializers"
+	CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"
+fi
+
 case "$test_type" in
 full)
     LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="yes"