Date: Fri, 26 Sep 2014 21:31:57 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1714 - trunk/Mk Message-ID: <201409262131.s8QLVvw2076009@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Sep 26 21:31:57 2014
New Revision: 1714
Log:
re-do previous commit for every USE_GCC
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Fri Sep 26 21:17:59 2014 (r1713)
+++ trunk/Mk/bsd.gecko.mk Fri Sep 26 21:31:57 2014 (r1714)
@@ -85,7 +85,7 @@
MOZILLA_BIN?= ${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?= ${MOZILLA}
-USES+= cpe gmake iconv perl5 pkgconfig \
+USES+= cpe compiler:c++11-lib gmake iconv perl5 pkgconfig \
python:2,build desktop-file-utils
CPE_VENDOR?=mozilla
USE_PERL5= build
@@ -327,15 +327,13 @@
.endif
.if ${PORT_OPTIONS:MPGO}
-USES+= compiler:gcc-c++11-lib
+USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*}
USE_DISPLAY=yes
.undef GNU_CONFIGURE
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ_PGO_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
-.else
-USES+= compiler:c++11-lib
.endif
.if ${PORT_OPTIONS:MALSA}
@@ -441,7 +439,7 @@
. endif
. endif
.elif ${ARCH:Mpowerpc*}
-USE_GCC?= yes
+USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*}
CFLAGS+= -D__STDC_CONSTANT_MACROS
. if ${ARCH} == "powerpc64"
MOZ_EXPORT+= UNAME_m="${ARCH}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409262131.s8QLVvw2076009>