diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:00:14 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 18:00:14 +0000 |
| commit | 91593e5d8623d6f38f7464ce6550431bf877530e (patch) | |
| tree | 5e020b43997063f84a1635efa6516b4f13846069 /gcc/ada/prj-ext.adb | |
| parent | d7335c7c79ba302a70450fe16cf93bbe689f1952 (diff) | |
| download | gcc-91593e5d8623d6f38f7464ce6550431bf877530e.tar.gz | |
2006-10-31 Vincent Celier <celier@adacore.com>
* gnatls.adb: Take into account GPR_PROJECT_PATH, when it is defined,
instead of ADA_PROJECT_PATH, for the project path.
(Gnatls): When displaying the project path directories, use host dir
specs.
* prj-ext.adb (Prj.Ext elaboration): On VMS, only expand relative path
names in the project path, as absolute paths may correspond to
multi-valued VMS logical names.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118278 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-ext.adb')
| -rw-r--r-- | gcc/ada/prj-ext.adb | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gcc/ada/prj-ext.adb b/gcc/ada/prj-ext.adb index c92ca9ffa20..649c2ba15e3 100644 --- a/gcc/ada/prj-ext.adb +++ b/gcc/ada/prj-ext.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2000-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 2000-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- -- @@ -24,9 +24,10 @@ -- -- ------------------------------------------------------------------------------ -with Namet; use Namet; -with Output; use Output; -with Osint; use Osint; +with Hostparm; +with Namet; use Namet; +with Output; use Output; +with Osint; use Osint; with Sdefault; with GNAT.HTable; @@ -73,7 +74,6 @@ package body Prj.Ext is is The_Key : Name_Id; The_Value : Name_Id; - begin Name_Len := Value'Length; Name_Buffer (1 .. Name_Len) := Value; @@ -251,10 +251,16 @@ begin Name_Len := Name_Len - No_Project_Default_Dir'Length - 1; - else + elsif not Hostparm.OpenVMS + or else not Is_Absolute_Path (Name_Buffer (First .. Last)) + then + -- On VMS, only expand relative path names, as absolute paths + -- may correspond to multi-valued VMS logical names. + declare New_Dir : constant String := - Normalize_Pathname (Name_Buffer (First .. Last)); + Normalize_Pathname (Name_Buffer (First .. Last)); + begin -- If the absolute path was resolved and is different from -- the original, replace original with the resolved path. |