diff options
| author | Vincent Celier <celier@adacore.com> | 2010-10-07 11:27:50 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-07 11:27:50 +0200 |
| commit | 844ba5faec84783f31bab615ea507508329b6620 (patch) | |
| tree | fb7f4151b08b0d75163c4e4bbfa25799270e3c79 | |
| parent | 72e9f2b94d238dedc6f1c9421e89826db6ddffdc (diff) | |
| download | gcc-844ba5faec84783f31bab615ea507508329b6620.zip gcc-844ba5faec84783f31bab615ea507508329b6620.tar.gz gcc-844ba5faec84783f31bab615ea507508329b6620.tar.bz2 | |
gnatcmd.adb (Check_Files): When looking for the .ci file for a binder generated file...
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
| -rw-r--r-- | gcc/ada/gnatcmd.adb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index a91653c..4e189e3 100644 --- a/gcc/ada/gnatcmd.adb +++ b/gcc/ada/gnatcmd.adb @@ -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; |