Bug 975729 - Move one CFLAGS variable in libmar signing code to DEFINES in moz.build; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 22 Feb 2014 21:40:15 -0500
changeset 170404 f56095f63fec9b8e942d1405139319c1b34f0b87
parent 170403 c7da089782cb2d1a8a41190b598136bf739b782f
child 170405 b522f84cf8f843ce8428b0311e5b6720518bcdd9
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmshal
bugs975729
milestone30.0a1
Bug 975729 - Move one CFLAGS variable in libmar signing code to DEFINES in moz.build; r=mshal
modules/libmar/sign/Makefile.in
modules/libmar/sign/moz.build
--- a/modules/libmar/sign/Makefile.in
+++ b/modules/libmar/sign/Makefile.in
@@ -1,12 +1,10 @@
 # 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/.
 
 # This makefile just builds support for reading archives.
-CFLAGS += -DMAR_NSS
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -13,11 +13,12 @@ UNIFIED_SOURCES += [
 
 FORCE_STATIC_LIB = True
 
 LOCAL_INCLUDES += [
     '../src',
     '../verify',
 ]
 
+DEFINES['MAR_NSS'] = True
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     USE_STATIC_LIBS = True