diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-27 13:38:58 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-27 13:38:58 +0000 |
| commit | 74f6b21d9c2206c1ff89881a648f12b7ed168be1 (patch) | |
| tree | d0e8b5f12fb45a78319041749a5e90564562fc32 /gcc/ada/prj-nmsc.adb | |
| parent | 29f86cb285c5f1cfa7c8f1033cd4b5108853cfd2 (diff) | |
| download | gcc-74f6b21d9c2206c1ff89881a648f12b7ed168be1.tar.gz | |
2004-10-26 Vincent Celier <celier@gnat.com>
* prj-nmsc.adb (Language_Independent_Check): Do not forbid virtual
extension of library projects.
* prj-part.adb: If env var ADA_PROJECT_PATH is not defined, project
path defaults to ".:<prefix>/lib/gnat".
(Parse): For an extending all project, allow direct import of a project
that is virtually extended.
* prj-proc.adb (Imported_Or_Extended_Project_From): If a project with
the specified name is directly imported, return its ID. Otherwise, if
an extension of this project is imported, return the ID of the
extension.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89662 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index c3193b8098e..8bca19c660a 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -3522,22 +3522,7 @@ package body Prj.Nmsc is end if; if Lib_Dir.Default then - - -- If the extending project is a virtual project, we - -- put the error message in the library project that - -- is extended, rather than in the extending all project. - -- Of course, we cannot put it in the virtual extending - -- project, because it has no source. - - if Data.Virtual then - Error_Msg_Name_1 := Extended_Data.Name; - - Error_Msg - (Project, - "library project % cannot be virtually extended", - Extended_Data.Location); - - else + if not Data.Virtual then Error_Msg (Project, "a project extending a library project must " & |