diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 09:36:24 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 09:36:24 +0000 |
commit | e25d6578ecf2d26418b86b597ff326de2e0244d0 (patch) | |
tree | 26be5ac589a2f9898be35b1657335ce04c95f003 /gcc/ada/prj-makr.adb | |
parent | a6320c6507e6e4491a47bc359082e9e1acc7f66d (diff) | |
download | gcc-e25d6578ecf2d26418b86b597ff326de2e0244d0.tar.gz |
2011-08-03 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, prj-proc.adb, prj-proc.ads, make.adb, prj-part.adb,
prj-part.ads, switch-m.adb, switch-m.ads, prj-makr.adb, clean.adb,
prj-pars.adb, prj-pars.ads, prj-conf.adb, prj-conf.ads, prj-tree.adb,
prj-tree.ads (Prj.Tree.Environment): new type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177248 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-makr.adb')
-rw-r--r-- | gcc/ada/prj-makr.adb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ada/prj-makr.adb b/gcc/ada/prj-makr.adb index 2910a3a3d0d..439ac0598a4 100644 --- a/gcc/ada/prj-makr.adb +++ b/gcc/ada/prj-makr.adb @@ -61,6 +61,8 @@ package body Prj.Makr is Tree : constant Project_Node_Tree_Ref := new Project_Node_Tree_Data; -- The project tree where the project file is parsed + Root_Environment : Prj.Tree.Environment; + Args : Argument_List_Access; -- The list of arguments for calls to the compiler to get the unit names -- and kinds (spec or body) in the Ada sources. @@ -795,10 +797,14 @@ package body Prj.Makr is Csets.Initialize; Snames.Initialize; + Prj.Initialize (No_Project_Tree); - Prj.Tree.Initialize (Tree); + + Prj.Tree.Initialize (Root_Environment, Flags); Prj.Env.Initialize_Default_Project_Path - (Tree.Project_Path, Target_Name => ""); + (Root_Environment.Project_Path, Target_Name => ""); + + Prj.Tree.Initialize (Tree); Sources.Set_Last (0); Source_Directories.Set_Last (0); @@ -866,7 +872,7 @@ package body Prj.Makr is Errout_Handling => Part.Finalize_If_Error, Store_Comments => True, Is_Config_File => False, - Flags => Flags, + Env => Root_Environment, Current_Directory => Get_Current_Dir, Packages_To_Check => Packages_To_Check_By_Gnatname); |