diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-24 13:13:04 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-24 13:13:04 +0000 |
| commit | 37baba8317de8046a7b71729dbc113b895e4ee50 (patch) | |
| tree | 05e7930e1c95e146a56c96c5b0caef56ec0f883c /gcc/ada/make.adb | |
| parent | f0c20d9000c63396e3122a71aaebe8201fbf5ade (diff) | |
| download | gcc-37baba8317de8046a7b71729dbc113b895e4ee50.tar.gz | |
2013-04-24 Robert Dewar <dewar@adacore.com>
* sem_prag.adb (Process_Convention): Move Stdcall tests to
Set_Convention_From_Pragma so that they are applied to each
entry of a homonym set.
(Process_Convention): Don't try to set convention if already set.
2013-04-24 Robert Dewar <dewar@adacore.com>
* gnatbind.adb: Minor reformatting.
2013-04-24 Vincent Celier <celier@adacore.com>
* clean.adb (Gnatclean): Add the default project search
directories in the project search path after scanning the
switches on the command line.
(Initialize): Do not put the default project search directories in the
project search path.
* gnatcmd.adb (GNATcmd): Add the default project search
directories in the project search path after scanning the switches
on the command line.
* make.adb (Initialize): Add the default project search
directories in the project search path after scanning the switches
on the command line.
2013-04-24 Yannick Moy <moy@adacore.com>
* restrict.ads (Restriction_Warnings): Initialize with all False value.
2013-04-24 Robert Dewar <dewar@adacore.com>
* checks.ads, checks.adb (Predicate_Checks_Suppressed): New function.
* exp_util.ads, exp_util.adb (Make_Predicate_Check): Check setting of
Predicate_Check.
* snames.ads-tmpl (Name_Predicate_Check): New check name.
* types.ads (Predicate_Check): New definition.
* gnat_rm.texi: Add documentation for Predicate_Check.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198226 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/make.adb')
| -rw-r--r-- | gcc/ada/make.adb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 56b7a7f1f64..9b1f0e3f128 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -6392,8 +6392,6 @@ package body Make is -- the command line switches Prj.Tree.Initialize (Env, Gnatmake_Flags); - Prj.Env.Initialize_Default_Project_Path - (Env.Project_Path, Target_Name => Sdefault.Target_Name.all); Project_Node_Tree := new Project_Node_Tree_Data; Prj.Tree.Initialize (Project_Node_Tree); @@ -6492,6 +6490,12 @@ package body Make is Usage; end if; + -- Add the default project search directories now, after the directories + -- that have been specified by switches -aP<dir>. + + Prj.Env.Initialize_Default_Project_Path + (Env.Project_Path, Target_Name => Sdefault.Target_Name.all); + -- Test for trailing -P switch if Project_File_Name_Present and then Project_File_Name = null then |