Index: security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.41
diff -u -r1.41 Linux.mk
--- security/coreconf/Linux.mk	29 Jul 2009 23:43:41 -0000	1.41
+++ security/coreconf/Linux.mk	31 Jul 2009 08:02:50 -0000
@@ -119,11 +119,7 @@
 endif
 
 ifdef BUILD_OPT
-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
-	OPTIMIZER = -Os
-else
-	OPTIMIZER = -O2
-endif
+	OPTIMIZER = $(OPT_FLAGS)
 ifdef MOZ_DEBUG_SYMBOLS
 	OPTIMIZER  += -gstabs+
 endif