Remove mcpp_mode.

Use preproc=='mcpp' instead, which works the same and adds less noise.
This commit is contained in:
Sei Lisa 2017-11-26 13:33:18 +01:00
parent f492d3e291
commit 26c4770bab

View file

@ -403,7 +403,6 @@ def main(argv):
predefines = True predefines = True
script_header = '' script_header = ''
script_timestamp = '' script_timestamp = ''
mcpp_mode = False
preshow = False preshow = False
raise_exception = False raise_exception = False
prettify = False prettify = False
@ -471,7 +470,6 @@ def main(argv):
% (preproc, u"', '".join(supported))) % (preproc, u"', '".join(supported)))
return 1 return 1
mcpp_mode = False
del preproc_cmdline[1:] del preproc_cmdline[1:]
if preproc == 'gcpp': if preproc == 'gcpp':
@ -481,7 +479,6 @@ def main(argv):
] ]
elif preproc == 'mcpp': elif preproc == 'mcpp':
mcpp_mode = True
preproc_cmdline = [ preproc_cmdline = [
'mcpp', '-e', 'UTF-8', '-I-', '-N', '-3', '-j', 'mcpp', '-e', 'UTF-8', '-I-', '-N', '-3', '-j',
'-V199901L', '-V199901L',
@ -627,7 +624,7 @@ def main(argv):
# At this point, for the external preprocessor to work we need the # At this point, for the external preprocessor to work we need the
# script as a byte array, not as unicode, but it should be UTF-8. # script as a byte array, not as unicode, but it should be UTF-8.
script = PreparePreproc(script) script = PreparePreproc(script)
if mcpp_mode: if preproc == 'mcpp':
# As a special treatment for mcpp, we force it to output its # As a special treatment for mcpp, we force it to output its
# macros so we can read if USE_xxx are defined. With GCC that # macros so we can read if USE_xxx are defined. With GCC that
# is achieved with -dN, but mcpp has no command line option. # is achieved with -dN, but mcpp has no command line option.