diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-05 10:14:50 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-05 10:14:50 +0000 |
| commit | 4c58ddd7c9041350525e112823e398e3b3f9e58c (patch) | |
| tree | ba7fd118079ee940543d3f23197253b06e5567f7 /gcc/ada/prj-env.adb | |
| parent | 7af3899959c6a27e2fde03222ae265f4cb54a7f4 (diff) | |
| download | gcc-4c58ddd7c9041350525e112823e398e3b3f9e58c.tar.gz | |
2010-10-05 Robert Dewar <dewar@adacore.com>
* exp_ch3.adb, exp_ch5.adb, exp_disp.adb, exp_dist.adb, gnatlink.adb,
makeutl.adb, par-ch6.adb, prj-dect.adb, prj-env.adb, prj-env.ads,
prj-ext.adb, prj-nmsc.adb, prj-part.adb, prj-pp.ads: Minor code
reorganization.
Minor reformatting.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164979 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-env.adb')
| -rw-r--r-- | gcc/ada/prj-env.adb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb index a9e9a8339d3..f6ae34ca158 100644 --- a/gcc/ada/prj-env.adb +++ b/gcc/ada/prj-env.adb @@ -24,16 +24,17 @@ ------------------------------------------------------------------------------ with Fmap; -with GNAT.Directory_Operations; use GNAT.Directory_Operations; with Hostparm; -with Makeutl; use Makeutl; +with Makeutl; use Makeutl; with Opt; -with Osint; use Osint; -with Output; use Output; -with Prj.Com; use Prj.Com; +with Osint; use Osint; +with Output; use Output; +with Prj.Com; use Prj.Com; with Sdefault; with Tempdir; +with GNAT.Directory_Operations; use GNAT.Directory_Operations; + package body Prj.Env is Buffer_Initial : constant := 1_000; @@ -110,9 +111,10 @@ package body Prj.Env is -- Project that itself is not extended. procedure Initialize_Project_Path - (Self : in out Project_Search_Path; Target_Name : String); - -- Initialize Current_Project_Path. - -- Does nothing if the path has already been initialized properly + (Self : in out Project_Search_Path; + Target_Name : String); + -- Initialize Current_Project_Path. Does nothing if the path has already + -- been initialized properly. ---------------------- -- Ada_Include_Path -- @@ -1780,7 +1782,8 @@ package body Prj.Env is ----------------------------- procedure Initialize_Project_Path - (Self : in out Project_Search_Path; Target_Name : String) + (Self : in out Project_Search_Path; + Target_Name : String) is Add_Default_Dir : Boolean := True; First : Positive; @@ -1801,6 +1804,7 @@ package body Prj.Env is begin -- If already initialized, nothing else to do + if Self.Path /= null and then Self.Path (Self.Path'First) /= '#' then |