diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2021-03-17 03:59:23 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-06-18 04:36:49 -0400 |
| commit | cd344e9570398b7436a4ed854618d5c186b20c02 (patch) | |
| tree | 38084899b0b5c67b4160277beec393555ce4f8e0 | |
| parent | 94c6d6fd7559167d3dc13698dbd58f27fb46cde4 (diff) | |
| download | gcc-cd344e9570398b7436a4ed854618d5c186b20c02.zip gcc-cd344e9570398b7436a4ed854618d5c186b20c02.tar.gz gcc-cd344e9570398b7436a4ed854618d5c186b20c02.tar.bz2 | |
[Ada] Fix handling of gnat check/test commands
gcc/ada/
* gnatcmd.adb: Fix handling of check and test commands.
| -rw-r--r-- | gcc/ada/gnatcmd.adb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index daa2482..94da878 100644 --- a/gcc/ada/gnatcmd.adb +++ b/gcc/ada/gnatcmd.adb @@ -472,6 +472,15 @@ begin Program := new String'(Command_List (The_Command).Unixcmd.all); + elsif The_Command in Check | Test then + Program := new String'(Command_List (The_Command).Unixcmd.all); + Find_Program_Name; + + if Name_Len > 5 then + First_Switches.Append + (new String' + ("--target=" & Name_Buffer (1 .. Name_Len - 5))); + end if; else Program := Program_Name (Command_List (The_Command).Unixcmd.all, "gnat"); @@ -481,13 +490,7 @@ begin -- instead of gnatmake/gnatclean. -- Ditto for gnatname -> gprname and gnatls -> gprls. - if The_Command = Make - or else The_Command = Compile - or else The_Command = Bind - or else The_Command = Link - or else The_Command = Clean - or else The_Command = Name - or else The_Command = List + if The_Command in Make | Compile | Bind | Link | Clean | Name | List then declare Switch : String_Access; @@ -588,23 +591,23 @@ begin end if; -- For FIND and XREF, look for switch -P. If it is specified, then - -- report an error indicating that the command is no longer supporting - -- project files. + -- report an error indicating that the command does not support project + -- files. - if The_Command = Find or else The_Command = Xref then + if The_Command in Find | Xref then declare Argv : String_Access; begin for Arg_Num in 1 .. Last_Switches.Last loop Argv := Last_Switches.Table (Arg_Num); - if Argv'Length >= 2 and then - Argv (Argv'First .. Argv'First + 1) = "-P" + if Argv'Length >= 2 + and then Argv (Argv'First .. Argv'First + 1) = "-P" then if The_Command = Find then - Fail ("'gnat find -P' is no longer supported;"); + Fail ("'gnat find -P' is not supported;"); else - Fail ("'gnat xref -P' is no longer supported;"); + Fail ("'gnat xref -P' is not supported;"); end if; end if; end loop; |