From c5484668f1bc5e676b00b5fccc0a23dfbd230a58 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sun, 3 Jun 2018 06:02:31 +0000 Subject: [PATCH] top(1): Only use NO_WERROR for base gcc This is what was intended. If statements are hard. --- usr.bin/top/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index f89a3e8a26be..58fc850a2922 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -10,12 +10,14 @@ MAN= top.1 WARNS?= 6 -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50000 +.if ${COMPILER_TYPE} == "gcc" +.if ${COMPILER_VERSION} >= 50000 CFLAGS.gcc=-Wno-error=cast-align -Wno-error=cast-qual -Wno-error=discarded-qualifiers -Wno-error=incompatible-pointer-types \ -Wno-error=maybe-uninitialized .else #base gcc NO_WERROR= .endif +.endif CFLAGS.clang=-Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=cast-qual -Wno-error=cast-align LIBADD= ncursesw m kvm jail