From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pla5A-0000DX-A0 for garchives@archives.gentoo.org; Sat, 05 Feb 2011 04:49:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFE871C002; Sat, 5 Feb 2011 04:49:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A81501C002 for ; Sat, 5 Feb 2011 04:49:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04A6D1B4113 for ; Sat, 5 Feb 2011 04:49:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7EDB28006E for ; Sat, 5 Feb 2011 04:39:40 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: mk/ X-VCS-Repository: proj/openrc X-VCS-Files: mk/cc.mk X-VCS-Directories: mk/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: aaaea44d224016bccfd008d0b904961f788d8189 Date: Sat, 5 Feb 2011 04:39:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 60b5d565157833aeb17a5abfe9c53588 commit: aaaea44d224016bccfd008d0b904961f788d8189 Author: William Hubbs gentoo org> AuthorDate: Wed Feb 2 20:57:10 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Feb 5 04:26:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Daaaea44d use make conditional for -cstd flag cc.mk was using ashell call to determine the value of the cstd variable. This reworks that code so it uses a make conditional. --- mk/cc.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/cc.mk b/mk/cc.mk index 74a816e..06556f0 100644 --- a/mk/cc.mk +++ b/mk/cc.mk @@ -5,9 +5,9 @@ CFLAGS?=3D -O2 =20 # Default to using the C99 standard CSTD?=3D c99 -_CSTD_SH=3D if test -n "${CSTD}"; then echo "-std=3D${CSTD}"; else echo = ""; fi -_CSTD:=3D $(shell ${_CSTD_SH}) -CFLAGS+=3D ${_CSTD} +ifneq (${CSTD},) +CFLAGS+=3D -std=3D${CSTD} +endif =20 # Try and use some good cc flags if we're building from git # We don't use -pedantic as it will warn about our perfectly valid