From ef9851983fc97751a7e6075628dadb7269046571 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Sun, 20 Feb 2022 22:00:46 -0500
Subject: [PATCH] update dune to 1.10, condition some rules to unix

---
 dune                 | 2 ++
 src/core/dune        | 2 +-
 src/data/dune        | 3 ++-
 src/dune             | 2 +-
 src/monomorphic/dune | 3 +--
 src/top/dune         | 1 -
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dune b/dune
index ba269461..18bee1e5 100644
--- a/dune
+++ b/dune
@@ -1,9 +1,11 @@
 (rule
  (targets README.md.corrected)
  (deps (package containers-data) ./src/mdx_runner.exe)
+ (enabled_if (= %{system} "linux"))
  (action (run ./src/mdx_runner.exe)))
 
 (rule
  (alias runtest)
  (package containers-data)
+ (enabled_if (= %{system} "linux"))
  (action (diff README.md README.md.corrected)))
diff --git a/src/core/dune b/src/core/dune
index 8389303d..d925f8d8 100644
--- a/src/core/dune
+++ b/src/core/dune
@@ -18,7 +18,7 @@
  (wrapped false)
  (modules :standard \ mkshims)
  (preprocess (action (run %{project_root}/src/core/cpp/cpp.exe %{input-file})))
- (flags :standard -warn-error -a+8 -w -32 -safe-string
+ (flags :standard -warn-error -a+8 -w -32-70 -safe-string
         -strict-sequence -nolabels -open CCMonomorphic)
  (libraries seq either containers.monomorphic))
 
diff --git a/src/data/dune b/src/data/dune
index 7c5c1868..fe2d6cc0 100644
--- a/src/data/dune
+++ b/src/data/dune
@@ -3,5 +3,6 @@
   (name containers_data)
   (public_name containers-data)
   (wrapped false)
-  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -open CCShims_)
+  (flags :standard -warn-error -3 -w -70 -color always
+         -safe-string -strict-sequence -open CCShims_)
   (libraries containers))
diff --git a/src/dune b/src/dune
index 9e4553c9..8cff22c0 100644
--- a/src/dune
+++ b/src/dune
@@ -1,7 +1,7 @@
 
 (env
   (_
-    (flags :standard -warn-error -3 -w -70 -color always)
+    (flags :standard -warn-error -a+8 -w -32-70 -color always -safe-string -strict-sequence)
     (ocamlopt_flags :standard -O3 -unbox-closures -unbox-closures-factor 20
                     -inline 100)
      ))
diff --git a/src/monomorphic/dune b/src/monomorphic/dune
index c3a3bdbd..318db32a 100644
--- a/src/monomorphic/dune
+++ b/src/monomorphic/dune
@@ -13,5 +13,4 @@
   (name containers_monomorphic)
   (public_name containers.monomorphic)
   (modules CCMonomorphic CCMonomorphicShims_)
-  (wrapped false)
-  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
+  (wrapped false))
diff --git a/src/top/dune b/src/top/dune
index 29a6a6b4..5c8f3724 100644
--- a/src/top/dune
+++ b/src/top/dune
@@ -4,5 +4,4 @@
   (name containers_top)
   (public_name containers.top)
   (wrapped false)
-  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
   (libraries compiler-libs.common containers containers.unix))