Received: by mail.netbsd.org (Postfix, from userid 605)
	id 3CBFA84E8C; Thu,  1 Sep 2022 01:32:31 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 7676E84E6E
	for <pkgsrc-changes@NetBSD.org>; Thu,  1 Sep 2022 01:32:30 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id AfnQltMGf7DZ for <pkgsrc-changes@netbsd.org>;
	Thu,  1 Sep 2022 01:32:30 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id C7C9784CED
	for <pkgsrc-changes@NetBSD.org>; Thu,  1 Sep 2022 01:32:29 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id C14FDFA8B; Thu,  1 Sep 2022 01:32:29 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1661995949219550"
MIME-Version: 1.0
Date: Thu, 1 Sep 2022 01:32:29 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/lang/llvm
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
X-Mailer: log_accum
Message-Id: <20220901013229.C14FDFA8B@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1661995949219550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Thu Sep  1 01:32:29 UTC 2022

Modified Files:
	pkgsrc/lang/llvm: Makefile

Log Message:
llvm: use simpler means of determining NetBSD version

And reflect the rough release when GCC went past 7.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/lang/llvm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1661995949219550
Content-Disposition: inline
Content-Length: 910
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.79 pkgsrc/lang/llvm/Makefile:1.80
--- pkgsrc/lang/llvm/Makefile:1.79	Tue Aug 30 07:13:02 2022
+++ pkgsrc/lang/llvm/Makefile	Thu Sep  1 01:32:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2022/08/30 07:13:02 he Exp $
+# $NetBSD: Makefile,v 1.80 2022/09/01 01:32:29 gutteridge Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -118,8 +118,7 @@ CXXFLAGS+=	-march=i586
 # Needed to avoid "relocation truncated to fit: R_PPC_REL24"
 CFLAGS+=	-mlongcall
 CXXFLAGS+=	-mlongcall
-.  if ${OPSYS} == "NetBSD"
-.    if empty(OS_VERSION:M8.*) && empty(OS_VERSION:M9.[012345678]*)
+.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 099917
 # The -mno-pltseq option is not available in gcc7, but is needed for
 # the above-mentioned relocation truncation issue in newer GCC
 CFLAGS+=	-mno-pltseq


--_----------=_1661995949219550--