diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-04 09:28:49 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-04 09:28:49 +0000 |
| commit | 0871eab295b615c10c70581240050c1822d3c419 (patch) | |
| tree | 366ebbf2aee44184c69781fa0ee3e11affa5e3e5 /gcc/ada/prj-conf.adb | |
| parent | 2f0a3a3596a2231b5375ceec7eda442e99354887 (diff) | |
| download | gcc-0871eab295b615c10c70581240050c1822d3c419.tar.gz | |
2013-01-04 Robert Dewar <dewar@adacore.com>
* types.ads, prj-conf.adb, par-tchk.adb: Minor reformatting.
2013-01-04 Robert Dewar <dewar@adacore.com>
* par-ch6.adb (P_Subprogram): Better handling of missing IS
after expression function.
* par-util.adb (No_Constraint): Improve handling to avoid bad warnings.
2013-01-04 Robert Dewar <dewar@adacore.com>
* exp_util.ads, exp_util.adb (Insert_Actions): In expression with
actions case, new actions are appended to the sequence rather than
prepended.
2013-01-04 Robert Dewar <dewar@adacore.com>
* gnat_ugn.texi: Document -gnatw.d/w.D (does no apply in VMS mode).
* usage.adb: Add lines for -gnatw.d/w.D switches.
* warnsw.adb: Minor fixes (some missing cases of setting
Warning_Doc_Switch). Reject -gnatw.d and -gnatw.D in VMS mode.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194895 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index 2a00c098621..d64c78b3bfc 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -688,9 +688,9 @@ package body Prj.Conf is if Switch.Value /= No_Name then Get_Name_String (Switch.Value); - if Conf_File_Name'Length = 0 and then - Name_Len > 9 and then - Name_Buffer (1 .. 9) = "--config=" + if Conf_File_Name'Length = 0 + and then Name_Len > 9 + and then Name_Buffer (1 .. 9) = "--config=" then Conf_File_Name := new String'(Name_Buffer (10 .. Name_Len)); @@ -1357,7 +1357,7 @@ package body Prj.Conf is end if; if Config_File_Path = null then - if (not Allow_Automatic_Generation) + if not Allow_Automatic_Generation and then Conf_File_Name'Length > 0 then Raise_Invalid_Config |