Bug 908142 - Part g: Remove defines from js/xpconnect/shell/Makefile.in; r=gps
authorMs2ger <ms2ger@gmail.com>
Sun, 20 Oct 2013 09:25:20 +0200
changeset 166190 a8ba2927199823c3a5787550f9f379ebd9821b1e
parent 166189 a9b08bb0f5fb8d6b3cc6f1a39adb22c4101c5ac4
child 166191 b443665abc830e71b9cb2ad3118e44d7f423d8f8
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs908142
milestone27.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 908142 - Part g: Remove defines from js/xpconnect/shell/Makefile.in; r=gps
js/xpconnect/shell/Makefile.in
js/xpconnect/shell/moz.build
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -31,21 +31,12 @@ include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
-DEFINES		+= -DJS_THREADSAFE
-
-ifdef MOZ_SHARK
-DEFINES += -DMOZ_SHARK
-endif
-ifdef MOZ_CALLGRIND
-DEFINES += -DMOZ_CALLGRIND
-endif
 ifdef MOZ_VTUNE
-DEFINES += -DMOZ_VTUNE
 CXXFLAGS += -IC:/Program\ Files/Intel/VTune/Analyzer/Include
 LIBS += C:/Program\ Files/Intel/VTune/Analyzer/Lib/VtuneApi.lib
 endif
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -13,8 +13,17 @@ PROGRAM = 'xpcshell'
 CPP_SOURCES += [
     'xpcshell.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'xpcshellMacUtils.mm',
     ]
+
+DEFINES['JS_THREADSAFE'] = True
+
+if CONFIG['MOZ_SHARK']:
+    DEFINES['MOZ_SHARK'] = True
+if CONFIG['MOZ_CALLGRIND']:
+    DEFINES['MOZ_CALLGRIND'] = True
+if CONFIG['MOZ_VTUNE']:
+    DEFINES['MOZ_VTUNE'] = True