Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1260066 - Move last uses of check_prog that weren't in the global scope to the global scope. r=nalexander

Browse Source
This commit is contained in:
Mike Hommey 2016-03-28 07:22:09 +09:00
parent a2652b3b0b
commit 71a1b9942f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moz.configure
View File

@ -147,15 +147,21 @@ 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)
@depends(target)
def linux_programs(target):
return namespace(
DSYMUTIL=('dsymutil', 'llvm-dsymutil'),
GENISOIMAGE=('genisoimage',),
)
if target.os == 'GNU' and target.kernel == 'Linux':
check_prog('RPMBUILD', ('rpmbuild',), allow_missing=True)
return namespace(RPMBUILD=('rpmbuild',))
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