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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165085 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb
index a91653c..4e189e3 100644 (file)
--- 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;