Bug 1256587 - Only check rpmbuild, genisoimage and dsymutil on the targets they are relevant for. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 15 Mar 2016 18:19:24 +0900
changeset 288842 8266c4f82c1a96c7d7c2c75d780f719cf90698ef
parent 288841 077732011acb8fb9890a3d2e93412e352bd358fa
child 288843 7314496982c0e5689975ae06f812fb31461d11d9
push id30091
push usercbook@mozilla.com
push dateWed, 16 Mar 2016 09:56:40 +0000
treeherdermozilla-central@341344bdec8f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1256587
milestone48.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 1256587 - Only check rpmbuild, genisoimage and dsymutil on the targets they are relevant for. r=gps
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -109,18 +109,26 @@ def perl_version_check(min_version):
                   'A full perl installation is required.')
 
 perl_version_check('5.006')
 
 
 # Miscellaneous programs
 # ==============================================================
 check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
-check_prog('DSYMUTIL', ('dsymutil', 'llvm-dsymutil'), allow_missing=True)
-check_prog('GENISOIMAGE', ('genisoimage',), allow_missing=True)
-check_prog('RPMBUILD', ('rpmbuild',), allow_missing=True)
 check_prog('UNZIP', ('unzip',))
 check_prog('XARGS', ('xargs',))
 check_prog('ZIP', ('zip',))
 
+@depends(target)
+def mac_programs(target):
+    if target.os == 'Darwin':
+        check_prog('DSYMUTIL', ('dsymutil', 'llvm-dsymutil'), allow_missing=True)
+        check_prog('GENISOIMAGE', ('genisoimage',), allow_missing=True)
+
+@depends(target)
+def linux_programs(target):
+    if target.os == 'GNU' and target.kernel == 'Linux':
+        check_prog('RPMBUILD', ('rpmbuild',), allow_missing=True)
+
 
 # Fallthrough to autoconf-based configure
 include('build/moz.configure/old.configure')