Bug 975736 - Port the remaining LDFLAGS variable in ipc/app/Makefile.in to moz.build; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 26 Feb 2014 21:42:21 -0500
changeset 171224 16f9af72591ed416b49ac50710ee88f36bc1ac00
parent 171223 78fd17e89089e0cda316ab59f80b2a83fdff0e08
child 171225 0cc15020119e1802b45320c99079c15ca2bb16b7
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmshal
bugs975736
milestone30.0a1
Bug 975736 - Port the remaining LDFLAGS variable in ipc/app/Makefile.in to moz.build; r=mshal
ipc/app/Makefile.in
ipc/app/moz.build
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -33,18 +33,16 @@ endif
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
-
 ifeq ($(OS_ARCH),WINNT) #{
 
 ifdef MOZ_CONTENT_SANDBOX
 LIBS += ../../security/sandbox/$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX)
 LIBS += $(NSPR_LIBS)
 endif
 
 # Note the manifest file exists in the tree, so we use the explicit filename
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -30,16 +30,18 @@ if CONFIG['MOZ_CONTENT_SANDBOX'] and CON
         '/security/sandbox/chromium',
     ]
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
     # a console application.
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
+LDFLAGS += [CONFIG['MOZ_ALLOW_HEAP_EXECUTE_FLAGS']]
+
 # Control the default heap size.
 # This is the heap returned by GetProcessHeap().
 # As we use the CRT heap, the default size is too large and wastes VM.
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.