bug 1200360 - fix $(DEFINES) usage in modules/libmar/tool/moz.build. r=mshal
authorTed Mielczarek <ted@mielczarek.org>
Tue, 08 Sep 2015 13:58:53 -0400
changeset 261557 a18a6dca709bc2cdd67227af4c1e099712c21d6d
parent 261556 b54844d26cb6e9dc09b6378ba6173c386231790a
child 261558 71d29e7967e5df599785de017a5f098f752845f8
push id64766
push usertmielczarek@mozilla.com
push dateWed, 09 Sep 2015 12:37:45 +0000
treeherdermozilla-inbound@a18a6dca709b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1200360
milestone43.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 1200360 - fix $(DEFINES) usage in modules/libmar/tool/moz.build. r=mshal
modules/libmar/tool/moz.build
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/tool/moz.build
@@ -22,16 +22,17 @@ if CONFIG['MOZ_ENABLE_SIGNMAR']:
     USE_LIBS += [
         'mar',
         'signmar',
         'verifymar',
     ]
 
 for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
+    HOST_DEFINES[var] = DEFINES[var]
 
 if CONFIG['MOZ_ENABLE_SIGNMAR']:
     USE_LIBS += [
         'nspr',
         'nss',
     ]
 else:
     DEFINES['NO_SIGN_VERIFY'] = True
@@ -55,17 +56,12 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
 if CONFIG['HOST_OS_ARCH'] == 'WINNT':
     HOST_OS_LIBS += [
         'ws2_32',
     ]
 
 # XXX: We should fix these warnings.
 ALLOW_COMPILER_WARNINGS = True
 
-HOST_CFLAGS += [
-    #TODO: bug 1200360 - don't pass make variables here
-    '$(DEFINES)',
-]
-
 HOST_DEFINES['NO_SIGN_VERIFY'] = True
 
 if CONFIG['CROSS_COMPILE'] and CONFIG['HOST_NSPR_MDCPUCFG']:
     HOST_DEFINES['MDCPUCFG'] = CONFIG['HOST_NSPR_MDCPUCFG']