From 74997959a7f275717c74c2dacc0e16b58f48dfd1 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 6 Sep 2024 15:59:00 -0400 Subject: [PATCH] jjb: Remove special cases for EL7 from build scripts Change-Id: Ifaba321a0a52beacbc3b560245d7fc0c47542c02 Signed-off-by: Kienan Stewart --- scripts/babeltrace/build.sh | 4 ++-- scripts/lttng-tools/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index a0246ab..feea2f4 100755 --- 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 75feed5..41b1fb7 100755 --- 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 -- 2.34.1