diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:04:45 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:04:45 +0000 |
commit | da0c370c59f7498b82ec8d12fce092dbddf60e52 (patch) | |
tree | 2882a1af068599e0ac01f5d2c814eb3e82a32072 /gcc/ada/prj-proc.adb | |
parent | 0eeabc1eee6fce2ff7cfd9eadcab88393d9f0933 (diff) | |
download | gcc-da0c370c59f7498b82ec8d12fce092dbddf60e52.tar.gz |
2006-10-31 Vincent Celier <celier@adacore.com>
* prj-nmsc.adb (Check_Ada_Name): For children of package A, G, I and S
on VMS, change "__" to '.' before checking the name.
(Record_Ada_Source): Always add the source file name in the list of
of sources, even if it is not the first time, as it is for another
source index.
(Get_Unit): Replace both '_' (after 'a', 'g', 'i' or 's') with a single
dot, instead of replacing only the first '_'.
* prj-part.adb (Parse): Convert project file path to canonical form
* prj-proc.adb (Recursive_Process): Make sure that, when a project is
extended, the project id of the project extending it is recorded in its
data, even when it has already been processed as an imported project.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118293 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-proc.adb')
-rw-r--r-- | gcc/ada/prj-proc.adb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index f79afc9e6c8..1c382ab5c40 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2006, 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- -- @@ -2340,6 +2340,16 @@ package body Prj.Proc is Project := Processed_Projects.Get (Name); if Project /= No_Project then + + -- Make sure that, when a project is extended, the project id + -- of the project extending it is recorded in its data, even + -- when it has already been processed as an imported project. + -- This is for virtually extended projects. + + if Extended_By /= No_Project then + In_Tree.Projects.Table (Project).Extended_By := Extended_By; + end if; + return; end if; |