From c9423ca3fa65282b0ca58d33976c150f78e24f23 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 10 Jan 2012 12:06:44 +0100 Subject: [multiple changes] 2012-01-10 Pascal Obry * prj-nmsc.adb (Check_Library_Attributes): Kill check for object/source directories for aggregate libraries. 2012-01-10 Matthew Heaney * a-cdlili.adb, a-cdlili.ads, a-cihama.adb, a-cihama.ads, a-coinve.adb, a-coinve.ads, a-ciorse.adb, a-ciorse.ads, a-coorma.adb, a-coorma.ads, a-cborma.adb, a-cborma.ads, a-cidlli.adb, a-cidlli.ads, a-cimutr.adb, a-cimutr.ads, a-cihase.adb, a-cihase.ads, a-cohama.adb, a-cohama.ads, a-coorse.adb, a-coorse.ads, a-cbhama.adb, a-cbhama.ads, a-cborse.adb, a-cborse.ads, a-comutr.adb, a-comutr.ads, a-ciorma.adb, a-cobove.adb, a-ciorma.ads, a-cobove.ads, a-convec.adb, a-convec.ads, a-cohase.adb, a-cohase.ads, a-cbdlli.adb, a-cbdlli.ads, a-cbmutr.adb, a-cbmutr.ads, a-cbhase.adb, a-cbhase.ads (Reference, Constant_Reference): Declare container parameter as aliased in/in out. Code clean ups. 2012-01-10 Bob Duff * s-os_lib.ads: Improve comment. 2012-01-10 Geert Bosch * s-gearop.adb (Forward_Eliminate): Avoid improper aliasing for complex Scalar. From-SVN: r183060 --- gcc/ada/prj-nmsc.adb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gcc/ada/prj-nmsc.adb') diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 21dc916..dac3047 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -2977,8 +2977,15 @@ package body Prj.Nmsc is "library directory { does not exist", Lib_Dir.Location, Project); - elsif not Project.Externally_Built then + -- Checks for object/source directories + elsif not Project.Externally_Built + + -- An aggregate library does not have sources or objects, so + -- these tests are not required in this case. + + and then Project.Qualifier /= Aggregate_Library + then -- Library directory cannot be the same as Object directory if Project.Library_Dir.Name = Project.Object_Directory.Name then -- cgit v1.1