github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-02-26 08:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also support --help -v, i.e. arguments in different order.

Browse Source
This commit is contained in:
Christian Jullien 2020-06-01 18:01:12 +02:00
parent bbb3f79bb8
commit e640ed1aeb
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libtcc.c
View File

@ -1723,6 +1723,7 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int *pargc, char ***pargv, int optind)
int tool = 0, arg_start = 0, noaction = optind; int tool = 0, arg_start = 0, noaction = optind;
char **argv = *pargv; char **argv = *pargv;
int argc = *pargc; int argc = *pargc;
int help = 0; /* remember if -h/--help has been seen */
cstr_new(&linker_arg); cstr_new(&linker_arg);
@ -1773,12 +1774,13 @@ reparse:
switch(popt->index) { switch(popt->index) {
case TCC_OPTION_HELP: case TCC_OPTION_HELP:
if (s->verbose > 0) /* help is requested, postpone return to check for -v */
return OPT_VERBOSE_HELP; help = OPT_HELP;
else break;
return OPT_HELP;
case TCC_OPTION_HELP2: case TCC_OPTION_HELP2:
return OPT_HELP2; /* help is requested, postpone return to check for -v */
help = OPT_HELP2;
break;
case TCC_OPTION_I: case TCC_OPTION_I:
tcc_add_include_path(s, optarg); tcc_add_include_path(s, optarg);
break; break;
@ -2064,6 +2066,14 @@ unsupported_option:
break; break;
} }
} }
if (help) {
if (s->verbose > 0)
return OPT_VERBOSE_HELP;
else
return help;
}
if (last_o > 0) if (last_o > 0)
tcc_define_symbol(s, "__OPTIMIZE__", NULL); tcc_define_symbol(s, "__OPTIMIZE__", NULL);
if (linker_arg.size) { if (linker_arg.size) {

2
tcc.c
View File

@ -273,7 +273,7 @@ redo:
return 0; return 0;
} }
if (opt == OPT_HELP2) { if (opt == OPT_HELP2) {
fputs(help, stdout); fputs(help2, stdout);
return 0; return 0;
} }
if (opt == OPT_VERBOSE_HELP) { if (opt == OPT_VERBOSE_HELP) {