From 6112432b3a81d9db116cd5d64c39648881cfff29 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Sat, 17 Sep 2022 07:53:56 +0200
Subject: [PATCH] move `-d:nimRawSetjmp` to config.nims (#30)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3c0b84..5661983 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,10 +149,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/nim.cfg b/tests/nim.cfg
index 9d2b0c6..48cb21a 100644
--- a/tests/nim.cfg
+++ b/tests/nim.cfg
@@ -1,2 +1,7 @@
 --threads:on
 
+# 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