Bug 975734 - Port the LDFLAGS variables in toolkit/crashreporter/injector/Makefile.in to moz.build; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 26 Feb 2014 21:40:07 -0500
changeset 188071 dcb142b44f68d8ae5636adfb9a981b13fb05b96d
parent 188070 0c188671f47556085d2f91f59871331934dbe848
child 188072 78fd17e89089e0cda316ab59f80b2a83fdff0e08
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs975734
milestone30.0a1
Bug 975734 - Port the LDFLAGS variables in toolkit/crashreporter/injector/Makefile.in to moz.build; r=mshal
toolkit/crashreporter/injector/Makefile.in
toolkit/crashreporter/injector/moz.build
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@@ -1,14 +1,8 @@
 # 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/.
 
 STL_FLAGS =
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
-
-ifndef GNU_CC
-LDFLAGS += -ENTRY:DummyEntryPoint
-else
-LDFLAGS += -Wl,-e,_DummyEntryPoint@12
-endif
--- a/toolkit/crashreporter/injector/moz.build
+++ b/toolkit/crashreporter/injector/moz.build
@@ -13,10 +13,14 @@ LIBRARY_NAME = 'breakpadinjector'
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FORCE_SHARED_LIB = True
 
 LOCAL_INCLUDES += [
     '/toolkit/crashreporter/google-breakpad/src',
 ]
 
+USE_STATIC_LIBS = True
 
-USE_STATIC_LIBS = True
+if CONFIG['GNU_CC']:
+    LDFLAGS += ['-Wl,-e,_DummyEntryPoint@12']
+else:
+    LDFLAGS += ['-ENTRY:DummyEntryPoint']