diff options
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index 4283dfc140f..1018781dd10 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -728,9 +728,10 @@ package body Prj.Conf is Value_Of (Name_Ide, Project.Decl.Packages, Shared); procedure Add_Config_Switches_For_Project - (Project : Project_Id; - Tree : Project_Tree_Ref; - With_State : in out Integer); + (Project : Project_Id; + Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + With_State : in out Integer); -- Add all --config switches for this project. This is also called -- for aggregate projects. @@ -739,11 +740,13 @@ package body Prj.Conf is ------------------------------------- procedure Add_Config_Switches_For_Project - (Project : Project_Id; - Tree : Project_Tree_Ref; - With_State : in out Integer) + (Project : Project_Id; + Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + With_State : in out Integer) is - pragma Unreferenced (With_State); + pragma Unreferenced (With_State, In_Aggregate_Lib); + Shared : constant Shared_Project_Tree_Data_Access := Tree.Shared; Variable : Variable_Value; @@ -757,9 +760,8 @@ package body Prj.Conf is Variable := Value_Of (Name_Languages, Project.Decl.Attributes, Shared); - if Variable = Nil_Variable_Value - or else Variable.Default - then + if Variable = Nil_Variable_Value or else Variable.Default then + -- Languages is not declared. If it is not an extending -- project, or if it extends a project with no Languages, -- check for Default_Language. @@ -792,17 +794,17 @@ package body Prj.Conf is Lang := Name_Find; Language_Htable.Set (Lang, Lang); - else - -- If no default language is declared, default to Ada + -- If no default language is declared, default to Ada + else Language_Htable.Set (Name_Ada, Name_Ada); end if; end if; elsif Variable.Values /= Nil_String then - -- Attribute Languages is declared with a non empty - -- list: put all the languages in Language_HTable. + -- Attribute Languages is declared with a non empty list: + -- put all the languages in Language_HTable. List := Variable.Values; while List /= Nil_String loop |