diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-16 14:39:51 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-16 14:39:51 +0000 |
| commit | 3c7edd99b145f49a14ea03c280f72c0ec52c6660 (patch) | |
| tree | fcce786e4bd1507c3bd52d0be313638eedc625db /gcc/ada/make.adb | |
| parent | 876eeb934907cc5b30f3bad17a9fd4e006e1042c (diff) | |
| download | gcc-3c7edd99b145f49a14ea03c280f72c0ec52c6660.tar.gz | |
2014-07-16 Vincent Celier <celier@adacore.com>
* make.adb: Do not read gnat.adc when gnatmake is invoked
with -gnatA.
2014-07-16 Pascal Obry <obry@adacore.com>
* gnat_rm.texi, impunit.adb, g-rewdat.adb, g-rewdat.ads: Initial
implementation of GNAT.Rewrite_Data.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212659 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/make.adb')
| -rw-r--r-- | gcc/ada/make.adb | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 74be6988cfa..ebd2bfd9a52 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -6671,13 +6671,15 @@ package body Make is Fname.UF.Initialize; - begin - Fname.SF.Read_Source_File_Name_Pragmas; + if Config_File then + begin + Fname.SF.Read_Source_File_Name_Pragmas; - exception - when Err : SFN_Scan.Syntax_Error_In_GNAT_ADC => - Make_Failed (Exception_Message (Err)); - end; + exception + when Err : SFN_Scan.Syntax_Error_In_GNAT_ADC => + Make_Failed (Exception_Message (Err)); + end; + end if; end if; -- Make sure no project object directory is recorded @@ -7907,6 +7909,12 @@ package body Make is Do_Link_Step := False; end if; + -- If -gnatA is specified, make sure that gnat.adc is never read + + elsif Argv'Length >= 6 and then Argv (2 .. 6) = "gnatA" then + Add_Switch (Argv, Compiler, And_Save => And_Save); + Opt.Config_File := False; + elsif Argv (2 .. Argv'Last) = "nostdlib" then -- Pass -nstdlib to gnatbind and gnatlink |