diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-04 13:46:35 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-04 13:46:35 +0000 |
| commit | 09ba36d90617bf2eba9338bf7e74376adb7e541f (patch) | |
| tree | 5d844c02464716a053a759f5d52fffb97421aff9 /gcc/ada/prj-nmsc.adb | |
| parent | cc0baf29276908bb403f7c7e55df09cd13b37839 (diff) | |
| download | gcc-09ba36d90617bf2eba9338bf7e74376adb7e541f.tar.gz | |
2010-10-04 Arnaud Charlet <charlet@adacore.com>
* s-taprop-mingw.adb (Create_Task): Initialize Thread_Id field to 0.
2010-10-04 Robert Dewar <dewar@adacore.com>
* exp_cg.adb: Minor code reorganization
Minor reformatting.
* exp_ch5.adb, prj-nmsc.adb: Minor reformatting.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164937 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index babb17d69b4..68c1849fa62 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -5280,15 +5280,20 @@ package body Prj.Nmsc is Recursive_Dirs.Reset (Visited); end Find_Source_Dirs; + -- Local declarations + Dir_Exists : Boolean; No_Sources : constant Boolean := - (((not Source_Files.Default) and then Source_Files.Values = Nil_String) - or else - ((not Source_Dirs.Default) and then Source_Dirs.Values = Nil_String) - or else - ((not Languages.Default) and then Languages.Values = Nil_String)) - and then Project.Extends = No_Project; + ((not Source_Files.Default + and then Source_Files.Values = Nil_String) + or else + (not Source_Dirs.Default + and then Source_Dirs.Values = Nil_String) + or else + (not Languages.Default + and then Languages.Values = Nil_String)) + and then Project.Extends = No_Project; -- Start of processing for Get_Directories @@ -5318,6 +5323,7 @@ package body Prj.Nmsc is Object_Dir.Location, Project); elsif not No_Sources then + -- We check that the specified object directory does exist. -- However, even when it doesn't exist, we set it to a default -- value. This is for the benefit of tools that recover from @@ -5338,8 +5344,8 @@ package body Prj.Nmsc is if not Dir_Exists and then not Project.Externally_Built then - -- The object directory does not exist, report an error if - -- the project is not externally built. + -- The object directory does not exist, report an error if the + -- project is not externally built. Err_Vars.Error_Msg_File_1 := File_Name_Type (Object_Dir.Value); @@ -5389,6 +5395,7 @@ package body Prj.Nmsc is Exec_Dir.Location, Project); elsif not No_Sources then + -- We check that the specified exec directory does exist Locate_Directory |