From 028342741eee445c44db2661b1c246623c96e01a Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 6 Jan 2021 17:00:18 +0100
Subject: [coqargs] use option injection for -w

---
 toplevel/coqargs.ml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/toplevel/coqargs.ml b/toplevel/coqargs.ml
index fbf3b4873b..c114c43e26 100644
--- a/toplevel/coqargs.ml
+++ b/toplevel/coqargs.ml
@@ -464,12 +464,8 @@ let parse_args ~help ~init arglist : t * string list =
 
     |"-w" | "-W" ->
       let w = next () in
-      if w = "none" then
-        (CWarnings.set_flags w; oval)
-      else
-        let w = CWarnings.get_flags () ^ "," ^ w in
-        CWarnings.set_flags (CWarnings.normalize_flags_string w);
-        oval
+      if w = "none" then add_set_option oval ["Warnings"] (Stm.OptionSet(Some w))
+      else add_set_option oval ["Warnings"] (Stm.OptionAppend w)
 
     |"-bytecode-compiler" ->
       { oval with config = { oval.config with enable_VM = get_bool opt (next ()) }}
-- 
cgit v1.2.3