Skip to content

Commit

Permalink
Bug 1264129 - Add verbosity for the shell and autoconf checks in moz.…
Browse files Browse the repository at this point in the history
…configure. r=gps

Also get an absolute path for the shell.
  • Loading branch information
glandium committed Apr 13, 2016
1 parent 1ede817 commit 2c621f9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build/moz.configure/init.configure
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,15 @@ option(env='MOZILLABUILD', nargs=1,
# It feels dirty replicating this from python/mozbuild/mozbuild/mozconfig.py,
# but the end goal being that the configure script would go away...
@depends('MOZILLABUILD')
@checking('for a shell')
@imports('sys')
def shell(mozillabuild):
shell = 'sh'
if mozillabuild:
shell = mozillabuild[0] + '/msys/bin/sh'
if sys.platform == 'win32':
shell = shell + '.exe'
return shell
return find_program(shell)


# Host and target systems
Expand Down
1 change: 1 addition & 0 deletions build/moz.configure/old.configure
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def encoded_open(path, mode):
option(env='AUTOCONF', nargs=1, help='Path to autoconf 2.13')

@depends(mozconfig, 'AUTOCONF')
@checking('for autoconf')
@imports('re')
def autoconf(mozconfig, autoconf):
mozconfig_autoconf = None
Expand Down

0 comments on commit 2c621f9

Please sign in to comment.