diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-23 09:36:49 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-23 09:36:49 +0000 |
| commit | b5dea9cd0ebbc1a3c706adbba8914f50837e4fa1 (patch) | |
| tree | ac173532856e499f071301288be35fa355582b5c /gcc/ada/makeutl.adb | |
| parent | 43c5696dfa156ed24dba1fac47723c3bd80bf4cd (diff) | |
| download | gcc-b5dea9cd0ebbc1a3c706adbba8914f50837e4fa1.tar.gz | |
2011-12-23 Pascal Obry <obry@adacore.com>
* prj.ads (For_Every_Project_Imported): Add In_Aggregate_Lib
parameter to generic formal procedure.
* prj.adb (For_Every_Project_Imported): Update accordingly.
(Recursive_Check): Likewise. Do not parse imported project for
aggregate library. This is needed as the imported projects are
there just to handle dependencies.
(Look_For_Sources): Likewise.
(Recursive_Add): Likewise.
* prj-env.adb, prj-conf.adb, makeutl.adb, gnatcmd.adb:
Add In_Aggregate_Lib parameter to routines used with
For_Every_Project_Imported generic procedure.
* prj-nmsc.adb (Tree_Processing_Data): Add In_Aggregate_Lib field.
(Check): Move where it is used. Fix implementation
to not check libraries that are inside aggregate libraries.
(Recursive_Check): Add In_Aggregate_Lib parameter.
2011-12-23 Ed Schonberg <schonberg@adacore.com>
* sem_ch7.adb (Analyze_Package_Body, Has_Referencer): A generic
package is a referencer regardless of whether there is a
subsequent subprogram with an Inline pragma.
2011-12-23 Geert Bosch <bosch@adacore.com>
* sem_ch3.adb (Can_Derive_From): Check matching Float_Rep on VMS.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182656 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/makeutl.adb')
| -rw-r--r-- | gcc/ada/makeutl.adb | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/gcc/ada/makeutl.adb b/gcc/ada/makeutl.adb index 119bcbd2a1d..df4bd2c89a5 100644 --- a/gcc/ada/makeutl.adb +++ b/gcc/ada/makeutl.adb @@ -692,9 +692,10 @@ package body Makeutl is is procedure Recursive_Add - (Project : Project_Id; - Tree : Project_Tree_Ref; - Extended : in out Boolean); + (Project : Project_Id; + Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + Extended : in out Boolean); -- Add all the source directories of a project to the path only if -- this project has not been visited. Calls itself recursively for -- projects being extended, and imported projects. @@ -731,14 +732,18 @@ package body Makeutl is ------------------- procedure Recursive_Add - (Project : Project_Id; - Tree : Project_Tree_Ref; - Extended : in out Boolean) + (Project : Project_Id; + Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + Extended : in out Boolean) is + pragma Unreferenced (In_Aggregate_Lib); + Current : String_List_Id; Dir : String_Element; OK : Boolean := False; Lang_Proc : Language_Ptr := Project.Languages; + begin -- Add to path all directories of this project @@ -1229,9 +1234,10 @@ package body Makeutl is In_Tree : Project_Tree_Ref) return String_List is procedure Recursive_Add - (Proj : Project_Id; - In_Tree : Project_Tree_Ref; - Dummy : in out Boolean); + (Proj : Project_Id; + In_Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + Dummy : in out Boolean); -- The recursive routine used to add linker options ------------------- @@ -1239,11 +1245,12 @@ package body Makeutl is ------------------- procedure Recursive_Add - (Proj : Project_Id; - In_Tree : Project_Tree_Ref; - Dummy : in out Boolean) + (Proj : Project_Id; + In_Tree : Project_Tree_Ref; + In_Aggregate_Lib : Boolean; + Dummy : in out Boolean) is - pragma Unreferenced (Dummy); + pragma Unreferenced (Dummy, In_Aggregate_Lib); Linker_Package : Package_Id; Options : Variable_Value; |