jjb: Remove special cases for EL7 from build scripts

Change-Id: Ifaba321a0a52beacbc3b560245d7fc0c47542c02
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index a0246ab646329f4867df13533e35bcbcba9b0005..feea2f490a7337bad107ebaaff18e7f06211eb64 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -227,9 +227,9 @@ freebsd*)
     ;;
 esac
 
-# Some warning flags are very dumb in GCC 4.8 on SLES12 / EL7, disable them
+# Some warning flags are very dumb in GCC 4.8 on SLES12, disable them
 # even if they are available.
-if [[ $platform = sles12sp5* ]] || [[ $platform = el7* ]]; then
+if [[ $platform = sles12sp5* ]]; then
     CFLAGS="$CFLAGS -Wno-missing-field-initializers -Wno-shadow"
     CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers -Wno-shadow"
 fi

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 75feed5e435d41bd53317cdbebc1b69e1c670d8e..41b1fb763614c2c5111ef6650c8256f10259c382 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -286,9 +286,9 @@ cygwin|cygwin64|msys32|msys64)
     ;;
 esac
 
-# Some warning flags are very dumb in GCC 4.8 on SLES12 / EL7, disable them
+# Some warning flags are very dumb in GCC 4.8 on SLES12, disable them
 # even if they are available.
-if [[ $platform = sles12sp5* ]] || [[  $platform = el7* ]]; then
+if [[ $platform = sles12sp5* ]]; then
     CFLAGS="$CFLAGS -Wno-missing-field-initializers -Wno-shadow"
     CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers -Wno-shadow"
 fi