From a3b1c98ecfe89edb297cf3fbf525120343d63f1d Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sat, 21 Nov 2020 08:54:35 +0100 Subject: Ignore plusargs options (that starts with a '+'). For #1517 --- src/ghdldrv/ghdllocal.adb | 4 +++- src/grt/grt-options.adb | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index 0e99d7233..8570144ee 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -1735,7 +1735,9 @@ package body Ghdllocal is declare Sec : constant String_Access := Args (Next_Arg); begin - if Sec (Sec'First) /= '-' then + if Sec (Sec'First) /= '-' + and then Sec (Sec'First) /= '+' + then Sec_Id := Convert_Name (Sec.all); Next_Arg := Args'First + 2; if Sec_Id = Null_Identifier then diff --git a/src/grt/grt-options.adb b/src/grt/grt-options.adb index eadca0068..d3d7a260e 100644 --- a/src/grt/grt-options.adb +++ b/src/grt/grt-options.adb @@ -239,6 +239,9 @@ package body Grt.Options is Status := Decode_Option_Ok; if Option = "--" then Status := Decode_Option_Last; + elsif Option (1) = '+' then + -- For VPI/VHPI - plusargs. + null; elsif Option = "--help" or else Option = "-h" then Help; Status := Decode_Option_Stop; -- cgit v1.2.3