зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1260327 - Remove the --recheck option of config.status. r=chmanchester
With mozconfigs injecting options, it never really worked as intended.
This commit is contained in:
Родитель
197084b5a7
Коммит
e1dc6088a2
|
@ -74,9 +74,6 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None,
|
|||
is in a different directory. It will, however, treat the directory
|
||||
containing config.status as the top object directory with the -n option.
|
||||
|
||||
The --recheck option, like with the original config.status, runs configure
|
||||
again, with the options given in the "ac_configure_args" subst.
|
||||
|
||||
The options to this function are passed when creating the
|
||||
ConfigEnvironment. These lists, as well as the actual wrapper script
|
||||
around this function, are meant to be generated by configure.
|
||||
|
@ -98,8 +95,6 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None,
|
|||
default_backends = (substs or {}).get('BUILD_BACKENDS', ['RecursiveMake'])
|
||||
|
||||
parser = ArgumentParser()
|
||||
parser.add_argument('--recheck', dest='recheck', action='store_true',
|
||||
help='update config.status by reconfiguring in the same conditions')
|
||||
parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
|
||||
help='display verbose output')
|
||||
parser.add_argument('-n', dest='not_topobjdir', action='store_true',
|
||||
|
@ -142,11 +137,6 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None,
|
|||
# This won't actually do anything because of the magic of generators.
|
||||
definitions = emitter.emit(reader.read_topsrcdir())
|
||||
|
||||
if options.recheck:
|
||||
# Execute configure from the top object directory
|
||||
os.chdir(topobjdir)
|
||||
os.execlp('sh', 'sh', '-c', ' '.join([os.path.join(topsrcdir, 'configure'), env.substs['ac_configure_args'], '--no-create', '--no-recursion']))
|
||||
|
||||
log_level = logging.DEBUG if options.verbose else logging.INFO
|
||||
log_manager.add_terminal_logging(level=log_level)
|
||||
log_manager.enable_unstructured()
|
||||
|
|
Загрузка…
Ссылка в новой задаче