diff options
author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-01 22:22:57 +0000 |
---|---|---|
committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-01 22:22:57 +0000 |
commit | 9e169c4bf36a38689550c059570c57efbf00a6fb (patch) | |
tree | 95e6800f7ac2a49ff7f799d96f04172320e70ac0 /gcc/ada/prj-conf.adb | |
parent | 6170dfb6edfb7b19f8ae5209b8f948fe0076a4ad (diff) | |
download | gcc-9e169c4bf36a38689550c059570c57efbf00a6fb.tar.gz |
Merged trunk at revision 161680 into branch.vect256
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/vect256@161681 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-conf.adb')
-rw-r--r-- | gcc/ada/prj-conf.adb | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index dfebd9a5d49..7ffa8d52b94 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2006-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 2006-2010, 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- -- @@ -23,23 +23,25 @@ -- -- ------------------------------------------------------------------------------ -with Ada.Directories; use Ada.Directories; -with GNAT.HTable; use GNAT.HTable; -with Makeutl; use Makeutl; +with Hostparm; +with Makeutl; use Makeutl; with MLib.Tgt; -with Opt; use Opt; -with Output; use Output; +with Opt; use Opt; +with Output; use Output; with Prj.Env; with Prj.Err; with Prj.Part; with Prj.PP; -with Prj.Proc; use Prj.Proc; -with Prj.Tree; use Prj.Tree; -with Prj.Util; use Prj.Util; -with Prj; use Prj; -with Snames; use Snames; -with System.Case_Util; use System.Case_Util; -with System; +with Prj.Proc; use Prj.Proc; +with Prj.Tree; use Prj.Tree; +with Prj.Util; use Prj.Util; +with Prj; use Prj; +with Snames; use Snames; + +with Ada.Directories; use Ada.Directories; + +with GNAT.Case_Util; use GNAT.Case_Util; +with GNAT.HTable; use GNAT.HTable; package body Prj.Conf is @@ -889,8 +891,18 @@ package body Prj.Conf is <<Process_Config_File>> if Automatically_Generated then - -- This might raise an Invalid_Config exception - Do_Autoconf; + if Hostparm.OpenVMS then + + -- There is no gprconfig on VMS + + raise Invalid_Config + with "could not locate any configuration project file"; + + else + -- This might raise an Invalid_Config exception + + Do_Autoconf; + end if; end if; -- Parse the configuration file |