diff options
| author | Marc Poulhiès <poulhies@adacore.com> | 2024-06-04 14:37:17 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2024-06-21 10:34:21 +0200 |
| commit | 498c6260ce0508a4c865071fed11e964d6f22b35 (patch) | |
| tree | c0db028d69c4fc0addfb15054e5e131de6f99915 /gcc/ada | |
| parent | 7a51065e94e759d20dcb00cf58d4b472cc8185fd (diff) | |
| download | gcc-498c6260ce0508a4c865071fed11e964d6f22b35.zip gcc-498c6260ce0508a4c865071fed11e964d6f22b35.tar.gz gcc-498c6260ce0508a4c865071fed11e964d6f22b35.tar.bz2 | |
ada: Change error message on invalid RTS path
Include the invalid path in the error message.
gcc/ada/
* make.adb (Scan_Make_Arg): Adjust error message.
* gnatls.adb (Search_RTS): Likewise.
* switch-b.adb (Scan_Debug_Switches): Likewise.
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/gnatls.adb | 11 | ||||
| -rw-r--r-- | gcc/ada/make.adb | 14 | ||||
| -rw-r--r-- | gcc/ada/switch-b.adb | 15 |
3 files changed, 27 insertions, 13 deletions
diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb index 2c26001..c52c1ae 100644 --- a/gcc/ada/gnatls.adb +++ b/gcc/ada/gnatls.adb @@ -1673,9 +1673,13 @@ procedure Gnatls is end if; if Lib_Path /= null then - Osint.Fail ("RTS path not valid: missing adainclude directory"); + Osint.Fail + ("RTS path """ & Name + & """ not valid: missing adainclude directory"); elsif Src_Path /= null then - Osint.Fail ("RTS path not valid: missing adalib directory"); + Osint.Fail + ("RTS path """ & Name + & """ not valid: missing adalib directory"); end if; -- Try to find the RTS on the project path. First setup the project path @@ -1710,7 +1714,8 @@ procedure Gnatls is end if; Osint.Fail - ("RTS path not valid: missing adainclude and adalib directories"); + ("RTS path """ & Name + & """ not valid: missing adainclude and adalib directories"); end Search_RTS; ------------------- diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 24b2d09..cef2434 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -4478,13 +4478,14 @@ package body Make is RTS_Switch := True; declare + RTS_Arg_Path : constant String := Argv (7 .. Argv'Last); Src_Path_Name : constant String_Ptr := Get_RTS_Search_Dir - (Argv (7 .. Argv'Last), Include); + (RTS_Arg_Path, Include); Lib_Path_Name : constant String_Ptr := Get_RTS_Search_Dir - (Argv (7 .. Argv'Last), Objects); + (RTS_Arg_Path, Objects); begin if Src_Path_Name /= null @@ -4501,16 +4502,19 @@ package body Make is and then Lib_Path_Name = null then Make_Failed - ("RTS path not valid: missing adainclude and adalib " + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adainclude and adalib " & "directories"); elsif Src_Path_Name = null then Make_Failed - ("RTS path not valid: missing adainclude directory"); + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adainclude directory"); else pragma Assert (Lib_Path_Name = null); Make_Failed - ("RTS path not valid: missing adalib directory"); + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adalib directory"); end if; end; end if; diff --git a/gcc/ada/switch-b.adb b/gcc/ada/switch-b.adb index 8d8dc58..2de516d 100644 --- a/gcc/ada/switch-b.adb +++ b/gcc/ada/switch-b.adb @@ -672,13 +672,15 @@ package body Switch.B is Opt.RTS_Switch := True; declare + RTS_Arg_Path : constant String := + Switch_Chars (Ptr + 1 .. Max); Src_Path_Name : constant String_Ptr := Get_RTS_Search_Dir - (Switch_Chars (Ptr + 1 .. Max), + (RTS_Arg_Path, Include); Lib_Path_Name : constant String_Ptr := Get_RTS_Search_Dir - (Switch_Chars (Ptr + 1 .. Max), + (RTS_Arg_Path, Objects); begin @@ -698,14 +700,17 @@ package body Switch.B is and then Lib_Path_Name = null then Osint.Fail - ("RTS path not valid: missing adainclude and " + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adainclude and " & "adalib directories"); elsif Src_Path_Name = null then Osint.Fail - ("RTS path not valid: missing adainclude directory"); + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adainclude directory"); else pragma Assert (Lib_Path_Name = null); Osint.Fail - ("RTS path not valid: missing adalib directory"); + ("RTS path """ & RTS_Arg_Path + & """ not valid: missing adalib directory"); end if; end; end if; |