summaryrefslogtreecommitdiff
path: root/gcc/ada/prj.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2011-09-02 11:13:01 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2011-09-02 11:13:01 +0200
commit5415acbd64a2d286fae516cad1733bbf977a9a1f (patch)
treeec9b26615a3bd8f8b4313b52af9e4618eda920ab /gcc/ada/prj.adb
parent735ca1b90d42bb9ceec2bc43d3ae99be603e0c5a (diff)
downloadgcc-5415acbd64a2d286fae516cad1733bbf977a9a1f.tar.gz
[multiple changes]
2011-09-02 Pascal Obry <obry@adacore.com> * prj-proc.adb, prj.adb, prj.ads, prj-dect.adb, prj-nmsc.adb, prj-conf.adb, projects.texi: Add support for aggregate library projects. 2011-09-02 Hristian Kirtchev <kirtchev@adacore.com> * exp_ch9.adb (Expand_N_Protected_Type_Declaration): Use Dynamic_Interrupt_Protection as the proper protection type when dynamic handler association is actually allowed. 2011-09-02 Robert Dewar <dewar@adacore.com> * makeutl.ads: Minor reformatting From-SVN: r178446
Diffstat (limited to 'gcc/ada/prj.adb')
-rw-r--r--gcc/ada/prj.adb6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index acf1bbe3741..3a2ef4ed1f9 100644
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -522,7 +522,7 @@ package body Prj is
-- Visit all aggregated projects
if Include_Aggregated
- and then Project.Qualifier = Aggregate
+ and then Project.Qualifier in Aggregate_Project
then
declare
Agg : Aggregated_Project_List;
@@ -857,7 +857,7 @@ package body Prj is
Free_List (Project.Languages);
case Project.Qualifier is
- when Aggregate =>
+ when Aggregate | Aggregate_Library =>
Free (Project.Aggregated_Projects);
when others =>
@@ -1665,7 +1665,7 @@ package body Prj is
begin
Action (Root_Project, Root_Tree);
- if Root_Project.Qualifier = Aggregate then
+ if Root_Project.Qualifier in Aggregate_Project then
Agg := Root_Project.Aggregated_Projects;
while Agg /= null loop
For_Project_And_Aggregated (Agg.Project, Agg.Tree);