From a8858233a8ce6fcc30a9d2f8b00784e1739058d9 Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Mon, 7 Oct 2024 08:06:34 +0000
Subject: [PATCH] hadrian: remove unused ghciWithDebugger field from flavour
config
This patch removes the ghciWithDebugger field from flavour config
since it's actually not used anywhere.
(cherry picked from commit c6e5fd3d29219f69935eb117648e4eeab16bba13)
(cherry picked from commit 022d7565b0f2dfd262e61ef14e7ed236b279bd40)
(cherry picked from commit f8c1723242cab832e22fec16c03d91ba8a520997)
---
hadrian/doc/user-settings.md | 3 ---
hadrian/src/Flavour/Type.hs | 3 ---
hadrian/src/Settings/Default.hs | 1 -
3 files changed, 7 deletions(-)
diff --git a/hadrian/doc/user-settings.md b/hadrian/doc/user-settings.md
index 795f877557f..6b0cfdcea06 100644
--- a/hadrian/doc/user-settings.md
+++ b/hadrian/doc/user-settings.md
@@ -33,9 +33,6 @@ data Flavour = Flavour {
rtsWays :: Ways,
-- | Build dynamic GHC programs.
dynamicGhcPrograms :: Action Bool,
- -- | Enable GHCi debugger.
- ghciWithDebugger :: Stage -- ^ stage of the /built/ compiler
- -> Bool,
-- | Build profiled GHC.
ghcProfiled :: Stage -- ^ stage of the /built/ compiler
-> Bool,
diff --git a/hadrian/src/Flavour/Type.hs b/hadrian/src/Flavour/Type.hs
index da236cbba3d..87963d8aaf1 100644
--- a/hadrian/src/Flavour/Type.hs
+++ b/hadrian/src/Flavour/Type.hs
@@ -28,9 +28,6 @@ data Flavour = Flavour {
rtsWays :: Ways,
-- | Build dynamic GHC programs.
dynamicGhcPrograms :: Action Bool,
- -- | Enable GHCi debugger.
- ghciWithDebugger :: Stage -- ^ stage of the /built/ compiler
- -> Bool,
-- | Build profiled GHC.
ghcProfiled :: Stage -- ^ stage of the /built/ compiler
-> Bool,
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index 245c9d079a0..b03c5f6de35 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/hadrian/src/Settings/Default.hs
@@ -248,7 +248,6 @@ defaultFlavour = Flavour
, libraryWays = defaultLibraryWays
, rtsWays = defaultRtsWays
, dynamicGhcPrograms = defaultDynamicGhcPrograms
- , ghciWithDebugger = const False
, ghcProfiled = const False
, ghcDebugged = const False
, ghcThreaded = const True
--
GitLab