[SVN-Commit] r1529 - in trunk/www: firefox firefox-nightly seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Mar  1 02:30:32 2014
New Revision: 1529

Log:
abort early with forced optimization

Modified:
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Feb 28 21:44:54 2014	(r1528)
+++ trunk/www/firefox-nightly/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
@@ -72,7 +72,11 @@
 # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
 # http://svnweb.freebsd.org/changeset/base/255804
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
-. if ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+IGNORE=		Cannot build with OPTIMIZED_CFLAGS option due to \
+		a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
+		use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
+. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
 CXXFLAGS+=	-O1
 . endif
 .endif

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Fri Feb 28 21:44:54 2014	(r1528)
+++ trunk/www/firefox/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
@@ -60,7 +60,11 @@
 # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
 # http://svnweb.freebsd.org/changeset/base/255804
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
-. if ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+IGNORE=		Cannot build with OPTIMIZED_CFLAGS option due to \
+		a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
+		use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
+. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
 CXXFLAGS+=	-O1
 . endif
 .endif

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Fri Feb 28 21:44:54 2014	(r1528)
+++ trunk/www/seamonkey/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
@@ -85,7 +85,11 @@
 # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
 # http://svnweb.freebsd.org/changeset/base/255804
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
-. if ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+IGNORE=		Cannot build with OPTIMIZED_CFLAGS option due to \
+		a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
+		use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
+. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
 CXXFLAGS+=	-O1
 . endif
 .endif