[SVN-Commit] r1534 - in trunk/www: firefox firefox-nightly seamonkey
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Tue Mar 4 04:33:47 UTC 2014
Author: jbeich
Date: Tue Mar 4 04:33:37 2014
New Revision: 1534
Log:
- use -msse2 if available to avoid clang crash
- allow building anyway with TRYBROKEN
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 Tue Mar 4 00:18:54 2014 (r1533)
+++ trunk/www/firefox-nightly/Makefile Tue Mar 4 04:33:37 2014 (r1534)
@@ -74,11 +74,16 @@
# http://svnweb.freebsd.org/changeset/base/255804
.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-IGNORE= Cannot build with OPTIMIZED_CFLAGS option due to \
+BROKEN= 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
+# apply workaround only for -O2 or greater
. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${MACHINE_CPU:Msse2}
+CXXFLAGS+= -msse2
+. else
CXXFLAGS+= -O1
+. endif
. endif
.endif
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Tue Mar 4 00:18:54 2014 (r1533)
+++ trunk/www/firefox/Makefile Tue Mar 4 04:33:37 2014 (r1534)
@@ -62,11 +62,16 @@
# http://svnweb.freebsd.org/changeset/base/255804
.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-IGNORE= Cannot build with OPTIMIZED_CFLAGS option due to \
+BROKEN= 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
+# apply workaround only for -O2 or greater
. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${MACHINE_CPU:Msse2}
+CXXFLAGS+= -msse2
+. else
CXXFLAGS+= -O1
+. endif
. endif
.endif
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Tue Mar 4 00:18:54 2014 (r1533)
+++ trunk/www/seamonkey/Makefile Tue Mar 4 04:33:37 2014 (r1534)
@@ -87,11 +87,16 @@
# http://svnweb.freebsd.org/changeset/base/255804
.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-IGNORE= Cannot build with OPTIMIZED_CFLAGS option due to \
+BROKEN= 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
+# apply workaround only for -O2 or greater
. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+. if ${MACHINE_CPU:Msse2}
+CXXFLAGS+= -msse2
+. else
CXXFLAGS+= -O1
+. endif
. endif
.endif
More information about the freebsd-gecko
mailing list