From owner-svn-src-all@freebsd.org  Sun Jun  3 06:02:32 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A3F3EFA4A8;
 Sun,  3 Jun 2018 06:02:32 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id F0E9C71991;
 Sun,  3 Jun 2018 06:02:31 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D1EA81AB8A;
 Sun,  3 Jun 2018 06:02:31 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5362VdQ066717;
 Sun, 3 Jun 2018 06:02:31 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5362VuJ066716;
 Sun, 3 Jun 2018 06:02:31 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201806030602.w5362VuJ066716@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 3 Jun 2018 06:02:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334554 - head/usr.bin/top
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/top
X-SVN-Commit-Revision: 334554
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2018 06:02:32 -0000

Author: eadler
Date: Sun Jun  3 06:02:31 2018
New Revision: 334554
URL: https://svnweb.freebsd.org/changeset/base/334554

Log:
  top(1): Only use NO_WERROR for base gcc
  
  This is what was intended. If statements are hard.

Modified:
  head/usr.bin/top/Makefile

Modified: head/usr.bin/top/Makefile
==============================================================================
--- head/usr.bin/top/Makefile	Sun Jun  3 05:20:11 2018	(r334553)
+++ head/usr.bin/top/Makefile	Sun Jun  3 06:02:31 2018	(r334554)
@@ -10,11 +10,13 @@ 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