aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/prj.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 17:09:05 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 17:09:05 +0200
commitb3f5eef0edceeba38905f9802ad8710751180516 (patch)
tree0793d1aef4d21a630cfedc99313709cb537ad6b3 /gcc/ada/prj.adb
parent9e5a6ee7c81968a13169634a16aef746e540c679 (diff)
downloadgcc-b3f5eef0edceeba38905f9802ad8710751180516.zip
gcc-b3f5eef0edceeba38905f9802ad8710751180516.tar.gz
gcc-b3f5eef0edceeba38905f9802ad8710751180516.tar.bz2
[multiple changes]
2014-07-30 Thomas Quinot <quinot@adacore.com> * lib-writ.ads: document format change. 2014-07-30 Pascal Obry <obry@adacore.com> * prj-util.adb (For_Interface_Sources): Do not include sources from withed externally built projects. 2014-07-30 Robert Dewar <dewar@adacore.com> * lib.adb: Minor reformatting. * prj-util.adb: Minor reformatting. 2014-07-30 Ed Schonberg <schonberg@adacore.com> * exp_aggr.adb (Build_Record_Aggr_Code): For an array component that depends on discriminants, and which is given by an others clause, create an explicit subtype with the discriminant values of the enclosing aggregate, because the backend cannot otherwise retrieve the actual bounds of the array. 2014-07-30 Fedor Rybin <frybin@adacore.com> * gnat_ugn.texi: Improve gnattest documentation. 2014-07-30 Pascal Obry <obry@adacore.com> * makeutl.adb (Insert_Project_Sources): Properly handle sources that are aggregated. We want to include sources not only part of libraries but also if part of an aggregated project from an aggregate library. * prj.adb (For_Project_And_Aggregated_Context): Properly check state of root project. From-SVN: r213296
Diffstat (limited to 'gcc/ada/prj.adb')
-rw-r--r--gcc/ada/prj.adb2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index 0562587..73b7709 100644
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -2101,7 +2101,7 @@ package body Prj is
if Project.Qualifier in Aggregate_Project then
Ctx :=
- (In_Aggregate_Lib => True,
+ (In_Aggregate_Lib => Project.Qualifier = Aggregate_Library,
From_Encapsulated_Lib =>
Context.From_Encapsulated_Lib
or else Project.Standalone_Library = Encapsulated);