summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsheaf <sam.derbyshire@gmail.com>2022-03-17 01:33:49 +0000
committerZubin Duggal <zubin.duggal@gmail.com>2022-05-09 13:37:27 +0530
commitbb7e0333aa8ea290ab620624294e22f621d0ce23 (patch)
tree8b470fca7e2fbf53541a30a62b8d96b6bf16a80b
parentfb979c8b4098564f157092e6aa206e2c741eba16 (diff)
downloadhaskell-bb7e0333aa8ea290ab620624294e22f621d0ce23.tar.gz
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. (cherry picked from commit 244da9ebc01b2a8c72f78e7be4411c32a4d0f524)
-rw-r--r--libraries/base/base.cabal20
1 files changed, 7 insertions, 13 deletions
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 1e6bca0b17..942cffb438 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -334,7 +334,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
@@ -406,12 +413,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
@@ -422,20 +423,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