From a3b09e330b0196d451d4e25f8069fb600978f661 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@tweag.io>
Date: Fri, 3 Nov 2023 12:31:33 +0100
Subject: [PATCH] Fix WORKSPACE setup for hadrian bindist

---
 WORKSPACE | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 5c5c948f77..6e379688ae 100755
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -90,11 +90,21 @@ load(
     "@rules_haskell//haskell:ghc_bindist_hadrian.bzl",
     "haskell_register_ghc_bindists_hadrian",
 )
-load(
-    "non_module_deps_1.bzl",
-    "test_cabalopts",
-    "test_ghcopts",
-)
+
+test_ghcopts = [
+    "-XStandaloneDeriving",  # Flag used at compile time
+    "-threaded",  # Flag used at link time
+    # Used by `tests/repl-flags`
+    "-DTESTS_TOOLCHAIN_COMPILER_FLAGS",
+    # this is the default, so it does not harm other tests
+    "-XNoOverloadedStrings",
+]
+
+test_cabalopts = [
+    # Used by `tests/cabal-toolchain-flags`
+    "--ghc-option=-DTESTS_TOOLCHAIN_CABALOPTS",
+    "--haddock-option=--optghc=-DTESTS_TOOLCHAIN_CABALOPTS",
+]
 
 haskell_register_ghc_bindists_hadrian(
     cabalopts = test_cabalopts,