mozilla-inbound: changeset 103690:954c8ade179ea3aaffb40c6bc8c552f9b5bf2448

author	Nathan Froyd <froydnj@mozilla.com>
	Tue, 28 Aug 2012 15:22:09 -0400
changeset 103690	954c8ade179ea3aaffb40c6bc8c552f9b5bf2448
parent 103689	152d19d479b20dd06bd68866ecdf6a6508f6ea58
child 103691	089fd92d1553f5b5970c2e388053609a82047d9f
push id	14117
push user	nfroyd@mozilla.com
push date	Tue, 28 Aug 2012 19:33:01 +0000
treeherder	mozilla-inbound@089fd92d1553 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	BenWa
bugs	786413
milestone	18.0a1
first release with	nightly linux32 706174d31a02 / 18.0a1 / 20120830030531 / files nightly linux64 706174d31a02 / 18.0a1 / 20120830030531 / files nightly mac 706174d31a02 / 18.0a1 / 20120830030531 / files nightly win32 706174d31a02 / 18.0a1 / 20120830030531 / files nightly win64 706174d31a02 / 18.0a1 / 20120830030531 / files
last release without	nightly linux32 8af2ff9c6018 / 18.0a1 / 20120828030555 / files nightly linux64 8af2ff9c6018 / 18.0a1 / 20120828030555 / files nightly mac 8af2ff9c6018 / 18.0a1 / 20120828030555 / files nightly win32 8af2ff9c6018 / 18.0a1 / 20120828030555 / files nightly win64 8af2ff9c6018 / 18.0a1 / 20120828030555 / files

--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -51,17 +51,19 @@ else
 	SSE2_FLAGS=
 endif
 endif
 endif
 endif
 
 # -pedantic causes warnings that we don't care about
 # so turn it off
-CFLAGS := $(filter-out -pedantic,$(CFLAGS))
+ifdef GNU_CC
+OS_CFLAGS := $(filter-out -pedantic,$(OS_CFLAGS))
+endif
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS          += -DMOZ_QCMS
 
 # Disable spammy "missing initializer" GCC warning