From 844ba5faec84783f31bab615ea507508329b6620 Mon Sep 17 00:00:00 2001 From: Vincent Celier Date: Thu, 7 Oct 2010 11:27:50 +0200 Subject: [PATCH] gnatcmd.adb (Check_Files): When looking for the .ci file for a binder generated file... 2010-10-07 Vincent Celier * 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 --- gcc/ada/gnatcmd.adb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index a91653cb94d..4e189e36909 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; -- 2.30.2