From owner-svn-ports-head@FreeBSD.ORG Fri Sep 5 09:36:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1BED2E2; Fri, 5 Sep 2014 09:36:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DCA116AE; Fri, 5 Sep 2014 09:36:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s859ak6S005787; Fri, 5 Sep 2014 09:36:46 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s859akTW005786; Fri, 5 Sep 2014 09:36:46 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409050936.s859akTW005786@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 5 Sep 2014 09:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367329 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2014 09:36:46 -0000 Author: bapt Date: Fri Sep 5 09:36:46 2014 New Revision: 367329 URL: http://svnweb.freebsd.org/changeset/ports/367329 QAT: https://qat.redports.org/buildarchive/r367329/ Log: Factorize USE_CSTD and USE_CXXSTD Differential Revision: https://reviews.freebsd.org/D722 Reviewed by: antoine Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Sep 5 09:25:45 2014 (r367328) +++ head/Mk/bsd.port.mk Fri Sep 5 09:36:46 2014 (r367329) @@ -2032,21 +2032,15 @@ CFLAGS+= -fno-strict-aliasing .endif .endif -.if defined(USE_CSTD) -CFLAGS:= ${CFLAGS:N-std=*} -std=${USE_CSTD} +.for lang in C CXX +.if defined(USE_${lang}STD) +${lang}FLAGS:= ${${lang}FLAGS:N-std=*} -std=${USE_${lang}STD} .endif -.if defined(CFLAGS_${ARCH}) -CFLAGS+= ${CFLAGS_${ARCH}} -.endif - -.if defined(USE_CXXSTD) -CXXFLAGS:= ${CXXFLAGS:N-std=*} -std=${USE_CXXSTD} -.endif - -.if defined(CXXFLAGS_${ARCH}) -CXXFLAGS+= ${CXXFLAGS_${ARCH}} +.if defined(${lang}FLAGS_${ARCH}) +${lang}FLAGS+= ${${lang}FLAGS_${ARCH}} .endif +.endfor # Multiple make jobs support .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)