Index: security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.31
diff -u -p -6 -r1.31 Linux.mk
--- security/coreconf/Linux.mk	22 Nov 2007 04:39:56 -0000	1.31
+++ security/coreconf/Linux.mk	22 Jan 2008 08:30:06 -0000
@@ -145,17 +145,13 @@ ifeq ($(OS_RELEASE),2.0)
 	endif
 	PROCESS_MAP_FILE = grep -v ';-' $< | \
          sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
 
 ifdef BUILD_OPT
-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
-	OPTIMIZER = -Os
-else
-	OPTIMIZER = -O2
-endif
+	OPTIMIZER = $(OPT_FLAGS)
 endif
 
 ifeq ($(USE_PTHREADS),1)
 OS_PTHREAD = -lpthread 
 endif