Bug 654049 - Use global optimization flags for jemalloc, cairo, pixman and sqlite. r=ted

db/sqlite3/src/Makefile.in

@@ -77,17 +77,6 @@ export:: sqlite-version.h
 endif
 endif
 
-ifdef GNU_CC
-MODULE_OPTIMIZE_FLAGS = -O2
-else
-ifeq ($(OS_ARCH),SunOS)
-MODULE_OPTIMIZE_FLAGS = -xO5
-endif
-ifeq ($(OS_ARCH),WINNT)
-MODULE_OPTIMIZE_FLAGS = -O2
-endif
-endif
-
 EXPORTS = \
   sqlite3.h \
   $(NULL)

gfx/cairo/cairo/src/Makefile.in

@@ -49,12 +49,7 @@ LIBXUL_LIBRARY = 1
 
 ifdef GNU_CC
 OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
-MODULE_OPTIMIZE_FLAGS = -O2
-else
-ifeq ($(OS_ARCH),SunOS)
-MODULE_OPTIMIZE_FLAGS = -xO5
-endif
-ifeq ($(OS_ARCH),WINNT)
+ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif

gfx/cairo/libpixman/src/Makefile.in

@@ -48,15 +48,8 @@ MODULE		= libpixman
 LIBRARY_NAME	= mozlibpixman
 LIBXUL_LIBRARY = 1
 
-ifdef GNU_CC
+ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
-else
-ifeq ($(OS_ARCH),SunOS)
-MODULE_OPTIMIZE_FLAGS = -xO5
-endif
-ifeq ($(OS_ARCH),WINNT)
-MODULE_OPTIMIZE_FLAGS = -O2
-endif
 endif
 
 DEFINES += -DPIXMAN_NO_TLS

memory/jemalloc/Makefile.in

@@ -126,7 +126,6 @@ NO_INSTALL_IMPORT_LIBRARY = 1
 endif
 else # Not Windows
 
-MODULE_OPTIMIZE_FLAGS = -O2
 ifeq ($(OS_ARCH),SunOS)
 ifndef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -xO5