diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 08:28:47 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 08:28:47 +0000 |
| commit | 700315b91cd7af93dfa463a671bb615a9cd9bfae (patch) | |
| tree | 654521d54854aa7c811d76cf7c5e45e9e3571f66 /gcc/ada/prj-conf.adb | |
| parent | e13474c869c67f5eb1687dc1df90817c00973c73 (diff) | |
| download | gcc-700315b91cd7af93dfa463a671bb615a9cd9bfae.tar.gz | |
2011-08-03 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, make.adb, prj-part.adb, prj-part.ads, prj-makr.adb,
clean.adb, prj-nmsc.adb, prj-pars.adb, prj-conf.adb, prj-env.adb,
prj-env.ads (Prj.Env.Initialize_Default_Project_Path,
Prj.Env.Initialize_Empty): new subprograms
(Get_Env, Find_Project): remove parameter Target_Name.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177241 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index 57b9fcafcca..da1d9287fa4 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2006-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 2006-2011, 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- -- @@ -1061,6 +1061,8 @@ package body Prj.Conf is Config_Project_Node : Project_Node_Id := Empty_Node; begin + pragma Assert (Prj.Env.Is_Initialized (Project_Node_Tree.Project_Path)); + Free (Config_File_Path); Config := No_Project; @@ -1121,8 +1123,7 @@ package body Prj.Conf is Packages_To_Check => Packages_To_Check, Current_Directory => Current_Directory, Is_Config_File => True, - Flags => Flags, - Target_Name => Target_Name); + Flags => Flags); else Config_Project_Node := Empty_Node; end if; @@ -1198,6 +1199,8 @@ package body Prj.Conf is On_Load_Config : Config_File_Hook := null) is begin + pragma Assert (Prj.Env.Is_Initialized (Project_Node_Tree.Project_Path)); + -- Parse the user project tree Prj.Initialize (Project_Tree); @@ -1213,8 +1216,7 @@ package body Prj.Conf is Packages_To_Check => Packages_To_Check, Current_Directory => Current_Directory, Is_Config_File => False, - Flags => Flags, - Target_Name => Target_Name); + Flags => Flags); if User_Project_Node = Empty_Node then User_Project_Node := Empty_Node; |