Bug 1043289 - Don't declare SOURCES and USE_LIBS when there is nothing to build. r=mshal

build/unix/elfhack/moz.build

@@ -7,14 +7,11 @@
 NO_DIST_INSTALL = True
 DIRS += ['inject']
 
-SOURCES += [
-    'test-array.c',
-    'test-ctors.c',
-]
-
 if not CONFIG['CROSS_COMPILE']:
     SOURCES += [
         'dummy.c',
+        'test-array.c',
+        'test-ctors.c',
     ]
 
 HOST_SOURCES += [

modules/libmar/tool/moz.build

@@ -4,13 +4,9 @@
 # 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/.
 
-if CONFIG['MOZ_ENABLE_SIGNMAR']:
-    PROGRAM = 'signmar'
-
-SOURCES = [
+HOST_SOURCES += [
     'mar.c',
 ]
-HOST_SOURCES += SOURCES
 
 HOST_PROGRAM = 'mar'
 
@@ -18,6 +14,17 @@ HOST_USE_LIBS += [
     'hostmar',
 ]
 
+if CONFIG['MOZ_ENABLE_SIGNMAR']:
+    PROGRAM = 'signmar'
+
+    SOURCES += HOST_SOURCES
+
+    USE_LIBS += [
+        'mar',
+        'signmar',
+        'verifymar',
+    ]
+
 for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
@@ -30,13 +37,3 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
     LDFLAGS += [
       '-framework Security',
     ]
-
-USE_LIBS += [
-    'mar',
-]
-
-if CONFIG['MOZ_ENABLE_SIGNMAR']:
-    USE_LIBS += [
-        'signmar',
-        'verifymar',
-    ]

toolkit/crashreporter/client/moz.build

@@ -6,11 +6,10 @@
 
 if CONFIG['OS_TARGET'] != 'Android':
     PROGRAM = 'crashreporter'
-# The xpcshell test case here verifies that the CA certificate list
 
-UNIFIED_SOURCES += [
-    'crashreporter.cpp',
-]
+    UNIFIED_SOURCES += [
+        'crashreporter.cpp',
+    ]
 
 LOCAL_INCLUDES += [
     '../google-breakpad/src',