Bug 975735 - Port the LDFLAGS variables in netwerk/streamconv/test/Makefile.in to moz.build; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 26 Feb 2014 21:41:18 -0500
changeset 170881 78fd17e89089e0cda316ab59f80b2a83fdff0e08
parent 170880 dcb142b44f68d8ae5636adfb9a981b13fb05b96d
child 170882 16f9af72591ed416b49ac50710ee88f36bc1ac00
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs975735
milestone30.0a1
Bug 975735 - Port the LDFLAGS variables in netwerk/streamconv/test/Makefile.in to moz.build; r=mshal
netwerk/streamconv/test/Makefile.in
netwerk/streamconv/test/moz.build
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -5,16 +5,8 @@
 
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef GNU_CXX
-LDFLAGS		+= -mconsole
-else
-LDFLAGS		+= -SUBSYSTEM:CONSOLE
-endif
-endif # WINNT
--- a/netwerk/streamconv/test/moz.build
+++ b/netwerk/streamconv/test/moz.build
@@ -11,8 +11,12 @@ UNIFIED_SOURCES += [
     'TestStreamConv.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     for var in ('MOZ_NO_DEBUG_RTL', 'NGPREFS'):
         DEFINES[var] = True
+    if CONFIG['GNU_CXX']:
+        LDFLAGS += ['-mconsole']
+    else:
+        LDFLAGS += ['-SUBSYSTEM:CONSOLE']