From 244da9ebc01b2a8c72f78e7be4411c32a4d0f524 Mon Sep 17 00:00:00 2001
From: sheaf <sam.derbyshire@gmail.com>
Date: Thu, 17 Mar 2022 01:33:49 +0000
Subject: [PATCH] List GHC.Event.Internal in base.cabal on Windows
GHC.Event.Internal was not listed in base.cabal on Windows. This caused
undefined reference errors. This patch adds it back, by moving it out
of the OS-specific logic in base.cabal.
Fixes #21245.
---
libraries/base/base.cabal | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 017b97081d1f..195e32083f7e 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -336,7 +336,14 @@ Library
GHC.IO.Handle.Lock.NoOp
GHC.IO.Handle.Lock.Windows
GHC.StaticPtr.Internal
+ GHC.Event.Arr
+ GHC.Event.Array
+ GHC.Event.Internal
GHC.Event.Internal.Types
+ GHC.Event.IntTable
+ GHC.Event.IntVar
+ GHC.Event.PSQ
+ GHC.Event.Unique
-- GHC.IOPort -- TODO: hide again after debug
System.Environment.ExecutablePath
System.CPUTime.Utils
@@ -409,12 +416,6 @@ Library
GHC.IO.Windows.Encoding
GHC.IO.Windows.Paths
other-modules:
- GHC.Event.Arr
- GHC.Event.Array
- GHC.Event.IntTable
- GHC.Event.IntVar
- GHC.Event.PSQ
- GHC.Event.Unique
System.CPUTime.Windows
c-sources:
cbits/Win32Utils.c
@@ -425,20 +426,13 @@ Library
exposed-modules:
GHC.Event
other-modules:
- GHC.Event.Arr
- GHC.Event.Array
GHC.Event.Control
GHC.Event.EPoll
- GHC.Event.IntTable
- GHC.Event.IntVar
- GHC.Event.Internal
GHC.Event.KQueue
GHC.Event.Manager
- GHC.Event.PSQ
GHC.Event.Poll
GHC.Event.Thread
GHC.Event.TimerManager
- GHC.Event.Unique
System.CPUTime.Posix.ClockGetTime
System.CPUTime.Posix.Times
--
GitLab