Fix problem with changed syntax of option -W for the compiler: -W will now

only be passed to the compiler together with all warning names.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5006 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2011-05-01 17:56:44 +00:00
parent 928c76235f
commit 417b14432c
2 changed files with 15 additions and 25 deletions

View File

@@ -60,7 +60,7 @@ Short options:
-S Compile but don't assemble and link -S Compile but don't assemble and link
-T Include source as comment -T Include source as comment
-V Print the version number -V Print the version number
-W Suppress warnings -W name[,...] Supress compiler warnings
-Wa options Pass options to the assembler -Wa options Pass options to the assembler
-Wl options Pass options to the linker -Wl options Pass options to the linker

View File

@@ -690,7 +690,7 @@ static void Usage (void)
" -S\t\t\t\tCompile but don't assemble and link\n" " -S\t\t\t\tCompile but don't assemble and link\n"
" -T\t\t\t\tInclude source as comment\n" " -T\t\t\t\tInclude source as comment\n"
" -V\t\t\t\tPrint the version number\n" " -V\t\t\t\tPrint the version number\n"
" -W\t\t\t\tSuppress warnings\n" " -W name[,...]\t\t\tSupress compiler warnings\n"
" -Wa options\t\t\tPass options to the assembler\n" " -Wa options\t\t\tPass options to the assembler\n"
" -Wl options\t\t\tPass options to the linker\n" " -Wl options\t\t\tPass options to the linker\n"
"\n" "\n"
@@ -1351,28 +1351,18 @@ int main (int argc, char* argv [])
OptVersion (Arg, 0); OptVersion (Arg, 0);
break; break;
case 'W': case 'W':
switch (Arg[2]) { if (Arg[2] == 'a' && Arg[3] == '\0') {
/* -Wa: Pass options to assembler */
case 'a': OptAsmArgs (Arg, GetArg (&I, 3));
OptAsmArgs (Arg, GetArg (&I, 3)); } else if (Arg[2] == 'l' && Arg[3] == '\0') {
break; /* -Wl: Pass options to linker */
OptLdArgs (Arg, GetArg (&I, 3));
case 'l': } else {
OptLdArgs (Arg, GetArg (&I, 3)); /* Anything else: Suppress warnings (compiler) */
break; CmdAddArg2 (&CC65, "-W", GetArg (&I, 3));
}
case '\0': break;
/* Suppress warnings - compiler and assembler */
CmdAddArg (&CC65, "-W");
CmdAddArg2 (&CA65, "-W", "0");
break;
default:
UnknownOption (Arg);
break;
}
break;
case 'c': case 'c':
/* Don't link the resulting files */ /* Don't link the resulting files */