diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-05-21 15:04:54 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-05-21 15:04:54 +0200 |
| commit | b7b92f15d30a1cae3d59af69dad849fe4025f24f (patch) | |
| tree | 216101f8a11441cc9848074c0539cf34e7ba9bd5 /gcc/ada/prj-dect.adb | |
| parent | 0df5ae93e08e17fbe36bfcd1bda8ea24af968a64 (diff) | |
| download | gcc-b7b92f15d30a1cae3d59af69dad849fe4025f24f.zip gcc-b7b92f15d30a1cae3d59af69dad849fe4025f24f.tar.gz gcc-b7b92f15d30a1cae3d59af69dad849fe4025f24f.tar.bz2 | |
[multiple changes]
2014-05-21 Robert Dewar <dewar@adacore.com>
* prj.ads, sem_ch12.adb, prj.adb, exp_pakd.adb,
sem_elab.ads: Minor reformatting.
* erroutc.adb, erroutc.ads (Warning_Specifically_Suppressed): Make Tag
parameter optional.
2014-05-21 Pascal Obry <obry@adacore.com>
* prj-dect.adb: Allow package Install in aggregate project.
From-SVN: r210703
Diffstat (limited to 'gcc/ada/prj-dect.adb')
| -rw-r--r-- | gcc/ada/prj-dect.adb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/prj-dect.adb b/gcc/ada/prj-dect.adb index 2ce0310..dafe882 100644 --- a/gcc/ada/prj-dect.adb +++ b/gcc/ada/prj-dect.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2014, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -214,8 +214,11 @@ package body Prj.Dect is Project_Qualifier_Of (Project, In_Tree); Name : constant Name_Id := Name_Of (Current_Package, In_Tree); begin - if Qualif in Aggregate_Project - and then Name /= Snames.Name_Builder + if (Qualif = Aggregate and then Name /= Snames.Name_Builder) + or else + (Qualif = Aggregate_Library + and then Name /= Snames.Name_Builder + and then Name /= Snames.Name_Install) then Error_Msg_Name_1 := Name; Error_Msg |