Bug 1235674 - Move CXXFLAGS from toolkit/crashreporter/client/Makefile.in to the corresponding moz.build. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 29 Dec 2015 17:14:49 +0900
changeset 277941 073716bf9e26306f696b26f137f9cf40314023a0
parent 277940 7dcbc70c513d905ae279a738cfd1946ecde08ff2
child 277942 6ceb8eadcf7e163c85b57f8803e812a3f8f3a0cc
push id69652
push usermh@glandium.org
push dateWed, 30 Dec 2015 22:48:01 +0000
treeherdermozilla-inbound@035431609d12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1235674
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1235674 - Move CXXFLAGS from toolkit/crashreporter/client/Makefile.in to the corresponding moz.build. r=mshal
toolkit/crashreporter/client/Makefile.in
toolkit/crashreporter/client/moz.build
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -2,24 +2,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifeq ($(OS_ARCH),WINNT)
 MOZ_WINCONSOLE = 0
 endif
 
-ifdef MOZ_WIDGET_GTK
-OS_CXXFLAGS += $(TK_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
-endif
-
-ifeq ($(OS_ARCH),SunOS)
-OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),Darwin)
 libs::
 	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app
 	rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app 
 	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
 	  iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -60,16 +60,18 @@ if CONFIG['MOZ_ENABLE_GTK']:
         'crashreporter_linux.cpp',
         'crashreporter_unix_common.cpp'
     ]
     USE_LIBS += [
         'breakpad_linux_common_s',
     ]
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += CONFIG['MOZ_GTHREAD_LIBS']
+    CXXFLAGS += CONFIG['TK_CFLAGS']
+    CXXFLAGS += CONFIG['MOZ_GTHREAD_CFLAGS']
 
 RCINCLUDE = 'crashreporter.rc'
 
 # Don't use the STL wrappers in the crashreporter clients; they don't
 # link with -lmozalloc, and it really doesn't matter here anyway.
 DISABLE_STL_WRAPPING = True
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')