svn commit: r367329 - head/Mk

Baptiste Daroussin bapt at FreeBSD.org
Fri Sep 5 09:36:46 UTC 2014


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)


More information about the svn-ports-head mailing list