Merge backout

This commit is contained in:
Ehsan Akhgari 2011-07-21 11:14:25 -04:00
commit 71a3314629
4 changed files with 31 additions and 0 deletions

View File

@ -77,6 +77,17 @@ 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)

View File

@ -49,6 +49,14 @@ 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)
MODULE_OPTIMIZE_FLAGS = -O2
endif
endif

View File

@ -48,6 +48,17 @@ MODULE = libpixman
LIBRARY_NAME = mozlibpixman
LIBXUL_LIBRARY = 1
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
DEFINES += -DPIXMAN_NO_TLS
# Build MMX code either with VC or with gcc-on-x86

View File

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