Bug 1260066 - Move last uses of check_prog that weren't in the global scope to the global scope. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 28 Mar 2016 07:22:09 +0900
changeset 290995 7c1b33d35a5b863984f29f6e91963110e38e2cdc
parent 290994 26a63e35fb25be588548f81e6067a24674e5c3a3
child 290996 63338edce3ba60f6668973b60bf832560e78d7c4
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1260066
milestone48.0a1
Bug 1260066 - Move last uses of check_prog that weren't in the global scope to the global scope. r=nalexander
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -142,21 +142,27 @@ perl_version_check('5.006')
 # ==============================================================
 check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
 check_prog('TAR', ('gnutar', 'gtar', 'tar'))
 check_prog('UNZIP', ('unzip',))
 check_prog('XARGS', ('xargs',))
 check_prog('ZIP', ('zip',))
 
 @depends(target)
-def mac_programs(target):
+def extra_programs(target):
     if target.kernel == 'Darwin':
-        check_prog('DSYMUTIL', ('dsymutil', 'llvm-dsymutil'), allow_missing=True)
-        check_prog('GENISOIMAGE', ('genisoimage',), allow_missing=True)
+        return namespace(
+            DSYMUTIL=('dsymutil', 'llvm-dsymutil'),
+            GENISOIMAGE=('genisoimage',),
+        )
+    if target.os == 'GNU' and target.kernel == 'Linux':
+        return namespace(RPMBUILD=('rpmbuild',))
 
-@depends(target)
-def linux_programs(target):
-    if target.os == 'GNU' and target.kernel == 'Linux':
-        check_prog('RPMBUILD', ('rpmbuild',), allow_missing=True)
+check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'),
+           allow_missing=True)
+check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'),
+           allow_missing=True)
+check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'),
+           allow_missing=True)
 
 
 # Fallthrough to autoconf-based configure
 include('build/moz.configure/old.configure')