diff options
author | Tristan Gingold <tgingold@free.fr> | 2014-11-04 05:23:35 +0100 |
---|---|---|
committer | Tristan Gingold <tgingold@free.fr> | 2014-11-04 05:23:35 +0100 |
commit | be337079af64ec9ce50d6d029b10c2eb9957b84d (patch) | |
tree | 03c400363d234cc6af56e0164ee79a54732fd3d2 /translate/ghdldrv | |
parent | bf69d7093a0bd0ed34881794721703bfa99a6d9b (diff) | |
download | ghdl-be337079af64ec9ce50d6d029b10c2eb9957b84d.tar.gz ghdl-be337079af64ec9ce50d6d029b10c2eb9957b84d.tar.bz2 ghdl-be337079af64ec9ce50d6d029b10c2eb9957b84d.zip |
Handle --expect-failure for -m
Diffstat (limited to 'translate/ghdldrv')
-rw-r--r-- | translate/ghdldrv/ghdldrv.adb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/translate/ghdldrv/ghdldrv.adb b/translate/ghdldrv/ghdldrv.adb index 9f42adff2..be905f1af 100644 --- a/translate/ghdldrv/ghdldrv.adb +++ b/translate/ghdldrv/ghdldrv.adb @@ -35,6 +35,7 @@ with Interfaces.C_Streams; with System; with Ghdlmain; use Ghdlmain; with Ghdllocal; use Ghdllocal; +with Errorout; with Version; with Options; @@ -1379,7 +1380,7 @@ package body Ghdldrv is begin Disp_Long_Help (Command_Comp (Cmd)); Put_Line (" -f Force recompilation of work units"); - Put_Line (" -Mu Disp unit dependences (humna format)"); + Put_Line (" -Mu Disp unit dependences (human format)"); end Disp_Long_Help; procedure Init (Cmd : in out Command_Make) is @@ -1389,12 +1390,10 @@ package body Ghdldrv is Cmd.Flag_Force := False; end Init; - procedure Decode_Option (Cmd : in out Command_Make; Option : String; Arg : String; - Res : out Option_Res) - is + Res : out Option_Res) is begin if Option = "-Mu" then Cmd.Flag_Depend_Unit := True; @@ -1606,6 +1605,13 @@ package body Ghdldrv is Link (Add_Std => True, Disp_Only => False); Delete_File (Filelist_Name.all, Success); end if; + exception + when Errorout.Compilation_Error => + if Flag_Expect_Failure then + return; + else + raise; + end if; end Perform_Action; -- Command Gen_Makefile. |