diff options
author | Vincent Celier <celier@adacore.com> | 2007-09-26 12:45:15 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2007-09-26 12:45:15 +0200 |
commit | a70f5d823abaf5ff25c7ef7f167a40c08889f698 (patch) | |
tree | eb05109c29fc6fe2f2bda12cbb7e7afa665618cf /gcc/ada/prj-util.adb | |
parent | 15cf0748477830cc0b490111a345dc36bb06de14 (diff) | |
download | gcc-a70f5d823abaf5ff25c7ef7f167a40c08889f698.zip gcc-a70f5d823abaf5ff25c7ef7f167a40c08889f698.tar.gz gcc-a70f5d823abaf5ff25c7ef7f167a40c08889f698.tar.bz2 |
makeutl.ads (Main_Config_Project): Moved to gpr_util.ads
2007-09-26 Vincent Celier <celier@adacore.com>
* makeutl.ads (Main_Config_Project): Moved to gpr_util.ads
* prj.ads, prj.adb (Default_Language): Remove function, no longer used
Replace components Compiler_Min_Options and Binder_Min_Options with
Compiler_Required_Switches and Binder_Required_Switches in record
Language_Config.
Remove components Default_Language and Config in Project_Tree_Data,
no longer used.
* prj-attr.adb: New attributes Required_Switches (<language>) in
packages Compiler and Binder.
* prj-nmsc.adb: Major rewrite of the processing of configuration
attributes for gprbuild. No impact on GNAT tools.
* prj-proc.ads, prj-proc.adb (Process_Project_Tree_Phase_2): No longer
process configuration attributes: this is done in Prj.Nmsc.Check.
(Recursive_Process): Make a full copy of packages inherited from project
being extended, instead of a shallow copy.
(Process_Project_Tree_Phase_1): New procedure
(Process_Project_Tree_Phase_1): New procedure
(Process): Implementation now uses the two new procedures
* prj-util.adb (Executable_Of): Get the suffix and the default suffix
from the project config, not the tree config that no longer exists.
From-SVN: r128797
Diffstat (limited to 'gcc/ada/prj-util.adb')
-rw-r--r-- | gcc/ada/prj-util.adb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb index b6086ad..1917bd2 100644 --- a/gcc/ada/prj-util.adb +++ b/gcc/ada/prj-util.adb @@ -145,7 +145,8 @@ package body Prj.Util is begin if Builder_Package /= No_Package then if Get_Mode = Multi_Language then - Executable_Suffix_Name := In_Tree.Config.Executable_Suffix; + Executable_Suffix_Name := + In_Tree.Projects.Table (Project).Config.Executable_Suffix; else Executable_Suffix := Prj.Util.Value_Of @@ -283,7 +284,8 @@ package body Prj.Util is Result : File_Name_Type; begin - Executable_Extension_On_Target := In_Tree.Config.Executable_Suffix; + Executable_Extension_On_Target := + In_Tree.Projects.Table (Project).Config.Executable_Suffix; Result := Executable_Name (Name_Find); Executable_Extension_On_Target := Saved_EEOT; return Result; |