From c1968934501c0d48e9404a9e0318859fa535c693 Mon Sep 17 00:00:00 2001
From: narimiran <narimiran@disroot.org>
Date: Fri, 17 Jun 2022 19:08:25 +0200
Subject: [PATCH] move -d:nimRawSetjmp to nim.cfg

Refs https://github.com/status-im/nimbus-build-system/issues/44
---
 .github/workflows/ci.yml | 4 ----
 nim.cfg                  | 5 +++++
 tests/config.nims        | 1 -
 tests/nim.cfg            | 7 +++++++
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 nim.cfg
 delete mode 100644 tests/config.nims
 create mode 100644 tests/nim.cfg

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a01d69..0a23a51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,10 +164,6 @@ jobs:
 
       - name: Run tests
         run: |
-          if [[ "${{ matrix.target.os }}" == "windows" ]]; then
-            # https://github.com/status-im/nimbus-eth2/issues/3121
-            export NIMFLAGS="-d:nimRawSetjmp"
-          fi
           nim --version
           nimble --version
           nimble install -y --depsOnly
diff --git a/nim.cfg b/nim.cfg
new file mode 100644
index 0000000..371f6d7
--- /dev/null
+++ b/nim.cfg
@@ -0,0 +1,5 @@
+# Avoid some rare stack corruption while using exceptions with a SEH-enabled
+# toolchain: https://github.com/status-im/nimbus-eth2/issues/3121
+@if windows and not vcc:
+  --define:nimRawSetjmp
+@end
diff --git a/tests/config.nims b/tests/config.nims
deleted file mode 100644
index 46348f1..0000000
--- a/tests/config.nims
+++ /dev/null
@@ -1 +0,0 @@
-switch("path", "..")
diff --git a/tests/nim.cfg b/tests/nim.cfg
new file mode 100644
index 0000000..b199b80
--- /dev/null
+++ b/tests/nim.cfg
@@ -0,0 +1,7 @@
+path = ".."
+
+# Avoid some rare stack corruption while using exceptions with a SEH-enabled
+# toolchain: https://github.com/status-im/nimbus-eth2/issues/3121
+@if windows and not vcc:
+  --define:nimRawSetjmp
+@end