From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 8 17:53:35 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9248CDB for ; Fri, 8 Feb 2013 17:53:35 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 38E9A390 for ; Fri, 8 Feb 2013 17:53:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r18HrYer003766 for ; Fri, 8 Feb 2013 17:53:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r18HrT3q002271 for freebsd-gecko@freebsd.org; Fri, 8 Feb 2013 17:53:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 8 Feb 2013 17:53:29 GMT Message-Id: <201302081753.r18HrT3q002271@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1162 - in trunk: Mk mail/thunderbird www/firefox www/firefox-nightly www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2013 17:53:35 -0000 Author: jbeich Date: Fri Feb 8 17:53:29 2013 New Revision: 1162 Log: try to reduce total build time (here be dragons) Suggested by: flo Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/seamonkey/Makefile Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Feb 8 17:53:18 2013 (r1161) +++ trunk/Mk/bsd.gecko.mk Fri Feb 8 17:53:29 2013 (r1162) @@ -551,6 +551,24 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .endif +.if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} +# try clang on x86 +. if ${ARCH} == amd64 || ${ARCH} == i386 +. if ${CC} == "cc" && (exists(/usr/bin/clang) || \ + exists(${LOCALBASE}/bin/clang)) +CC= clang +. endif +. if ${CXX} == "c++" && (exists(/usr/bin/clang++) || \ + exists(${LOCALBASE}/bin/clang++)) +CXX= clang++ +. endif +. endif +# fallback to gcc otherwise +. if ${CC} == "cc" || ${CXX} == "c++" +USE_GCC?= yes +. endif +.endif + .if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955) .if ${OSVERSION} > 1000011 # use jemalloc 3.0.0 API in libc @@ -912,6 +930,10 @@ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' +.if ${CXX} == "clang++" && ${OSVERSION} < 900506 + @${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -e 's/-mss/-mmmx &/' +.endif .if ${MOZILLA} != "kompozer" @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Fri Feb 8 17:53:18 2013 (r1161) +++ trunk/mail/thunderbird/Makefile Fri Feb 8 17:53:29 2013 (r1162) @@ -64,10 +64,6 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi -.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 -USE_GCC?= 4.7+ -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Fri Feb 8 17:53:18 2013 (r1161) +++ trunk/www/firefox-nightly/Makefile Fri Feb 8 17:53:29 2013 (r1162) @@ -58,10 +58,6 @@ WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://} -.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 -USE_GCC?= 4.7+ -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Feb 8 17:53:18 2013 (r1161) +++ trunk/www/firefox/Makefile Fri Feb 8 17:53:29 2013 (r1162) @@ -56,10 +56,6 @@ WRKSRC:= ${WRKDIR}/mozilla-beta -.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 -USE_GCC?= 4.7+ -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Fri Feb 8 17:53:18 2013 (r1161) +++ trunk/www/seamonkey/Makefile Fri Feb 8 17:53:29 2013 (r1162) @@ -72,10 +72,6 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi -.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 -USE_GCC?= 4.7+ -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64