diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-01-04 10:24:06 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-01-04 10:24:06 +0100 |
| commit | dc8b370ac022cd0cfd0a5498f2cb8dbc0a286cf6 (patch) | |
| tree | 7b01870ca42247e84f967c8350dc07e04f494cfd /gcc/ada/prj-nmsc.adb | |
| parent | 33bd17e742dc4956590a6ff8d2676f1c8eaf305f (diff) | |
| download | gcc-dc8b370ac022cd0cfd0a5498f2cb8dbc0a286cf6.zip gcc-dc8b370ac022cd0cfd0a5498f2cb8dbc0a286cf6.tar.gz gcc-dc8b370ac022cd0cfd0a5498f2cb8dbc0a286cf6.tar.bz2 | |
[multiple changes]
2013-01-04 Pascal Obry <obry@adacore.com>
* prj-nmsc.adb: Minor reformatting.
2013-01-04 Vincent Celier <celier@adacore.com>
* makeutl.ads (Root_Environment): New variable, moved rom
gprbuild (Load_Standard_Base): New Boolean variable, moved
from gprbuild.
* prj-conf.adb (Check_Builder_Switches): New procedure to check
for switch --RTS in package Builder. If a runtime specified
by --RTS is a relative path name, but not a base name, then
find the path on the Project Search Path.
(Do_Autoconf): Call Check_Builder_Switches.
(Locate_Runtime): New procedure, moved from gprbuild, to get the
absolute paths of runtimes when they are not specified as a base name.
* prj-conf.ads (Locate_Runtime): New procedure, moved from gprbuild.
From-SVN: r194893
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 77d1cfd..b956292 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -6727,9 +6727,9 @@ package body Prj.Nmsc is procedure Free (Data : in out Project_Processing_Data) is begin - Source_Names_Htable.Reset (Data.Source_Names); - Unit_Exceptions_Htable.Reset (Data.Unit_Exceptions); - Excluded_Sources_Htable.Reset (Data.Excluded); + Source_Names_Htable.Reset (Data.Source_Names); + Unit_Exceptions_Htable.Reset (Data.Unit_Exceptions); + Excluded_Sources_Htable.Reset (Data.Excluded); end Free; ------------------------------- @@ -6996,9 +6996,9 @@ package body Prj.Nmsc is if Name_Loc.Source.Naming_Exception = Inherited then declare - Proj : Project_Id := Name_Loc.Source.Project.Extends; - Iter : Source_Iterator; - Src : Source_Id; + Proj : Project_Id := Name_Loc.Source.Project.Extends; + Iter : Source_Iterator; + Src : Source_Id; begin while Proj /= No_Project loop Iter := For_Each_Source (Data.Tree, Proj); @@ -7149,10 +7149,10 @@ package body Prj.Nmsc is (Path : Path_Information; Rank : Natural) return Boolean is - Dir : Dir_Type; - Name : String (1 .. 250); - Last : Natural; - Found : Path_Information; + Dir : Dir_Type; + Name : String (1 .. 250); + Last : Natural; + Found : Path_Information; Success : Boolean := False; begin @@ -7198,10 +7198,10 @@ package body Prj.Nmsc is Rank : Natural) return Boolean is Path_Str : constant String := Get_Name_String (Path.Display_Name); - Dir : Dir_Type; - Name : String (1 .. 250); - Last : Natural; - Success : Boolean := False; + Dir : Dir_Type; + Name : String (1 .. 250); + Last : Natural; + Success : Boolean := False; begin Debug_Output ("looking for subdirs of ", Name_Id (Path.Display_Name)); @@ -8321,9 +8321,7 @@ package body Prj.Nmsc is procedure Check_Not_Defined (Name : Name_Id) is Var : constant Prj.Variable_Value := Prj.Util.Value_Of - (Name, - Project.Decl.Attributes, - Data.Tree.Shared); + (Name, Project.Decl.Attributes, Data.Tree.Shared); begin if not Var.Default then Error_Msg_Name_1 := Name; |