[SVN-Commit] r664 - branches/experimental/Mk trunk/Mk

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sun Oct 23 18:34:17 2011
New Revision: 664

Log:
- Remove some vendor optimization for WITHOUT_OPTIMIZED_CFLAGS

PR:		ports/161463
Submitted by:	Nali Toja <nalitoja AT gmail.com>

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   trunk/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Sat Oct 22 20:59:29 2011	(r663)
+++ branches/experimental/Mk/bsd.gecko.mk	Sun Oct 23 18:34:17 2011	(r664)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.43 2011/10/19 16:00:43 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.44 2011/10/23 18:31:57 beat Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -659,11 +659,12 @@
 			PERL=${PERL}
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
+MOZ_OPTIONS+=	--enable-optimize=${WITH_OPTIMIZE}
 CFLAGS:=	${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
 WITH_OPTIMIZE?=	-O2
 .else
+MOZ_OPTIONS+=	--disable-optimize
 CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
-WITH_OPTIMIZE?=
 .endif
 
 .if defined(WITH_SMB)
@@ -683,8 +684,7 @@
 MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
-MOZ_OPTIONS+=	--disable-debug				\
-		--enable-optimize=${WITH_OPTIMIZE}
+MOZ_OPTIONS+=	--disable-debug
 .endif
 
 .if defined(WITH_JAVA) && defined(_WITH_JAVA)

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Oct 22 20:59:29 2011	(r663)
+++ trunk/Mk/bsd.gecko.mk	Sun Oct 23 18:34:17 2011	(r664)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.43 2011/10/19 16:00:43 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.44 2011/10/23 18:31:57 beat Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -659,11 +659,12 @@
 			PERL=${PERL}
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
+MOZ_OPTIONS+=	--enable-optimize=${WITH_OPTIMIZE}
 CFLAGS:=	${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
 WITH_OPTIMIZE?=	-O2
 .else
+MOZ_OPTIONS+=	--disable-optimize
 CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
-WITH_OPTIMIZE?=
 .endif
 
 .if defined(WITH_SMB)
@@ -683,8 +684,7 @@
 MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
-MOZ_OPTIONS+=	--disable-debug				\
-		--enable-optimize=${WITH_OPTIMIZE}
+MOZ_OPTIONS+=	--disable-debug
 .endif
 
 .if defined(WITH_JAVA) && defined(_WITH_JAVA)