procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnatcmd.adb (Check_Files): When looking for the .ci file for a binder generated file...

Browse source 
2010-10-07  Vincent Celier  <celier@adacore.com>
        
        * gnatcmd.adb (Check_Files): When looking for the .ci file for a
        binder generated file, look for both b~xxx and b__xxx as gprbuild
        always uses b__ as the prefix of such files.

From-SVN: r165085
This commit is contained in:
Vincent Celier 2010-10-07 11:27:50 +02:00 • committed by Arnaud Charlet
parent 72e9f2b94d
commit 844ba5faec
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gcc/ada/gnatcmd.adb
View file

@ -407,6 +407,21 @@ procedure GNATCmd is
(Main).Value),
"ci"));
if not Is_Regular_File (File.all) and then
B_Start.all /= "b__"
then
File :=
new String'
(Get_Name_String
(Proj.Project.Object_Directory.Name) &
"b__" &
MLib.Fil.Ext_To
(Get_Name_String
(Project_Tree.String_Elements.Table
(Main).Value),
"ci"));
end if;
if Is_Regular_File (File.all) then
Last_Switches.Increment_Last;
Last_Switches.Table (Last_Switches.Last) := File;
@ -430,6 +445,19 @@ procedure GNATCmd is
Get_Name_String (Proj.Project.Library_Name) &
".ci");
if not Is_Regular_File (File.all) and then
B_Start.all /= "b__"
then
File :=
new String'
(Get_Name_String
(Proj.Project.Object_Directory.Name) &
"b__" &
Get_Name_String
(Proj.Project.Library_Name) &
".ci");
end if;
if Is_Regular_File (File.all) then
Last_Switches.Increment_Last;
Last_Switches.Table (Last_Switches.Last) := File;