diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-11-21 13:27:23 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-11-21 13:27:23 -0500 |
| commit | 3a56337be36496ae4c11eb9afff092ebc0283256 (patch) | |
| tree | a8b461b6f7ac334a3d7a4e391265c22bdee8aaae /hadrian/src/Settings | |
| parent | 451aeac3b07f171f148995717d0d9a1eefe08f0e (diff) | |
| download | haskell-wip/drop-touch.tar.gz | |
Drop dependence on `touch`wip/drop-touch
This drops GHC's dependence on the `touch` program, instead implementing
it within GHC. This eliminates an external dependency and means that we
have one fewer program to keep track of in the `configure` script
Diffstat (limited to 'hadrian/src/Settings')
| -rw-r--r-- | hadrian/src/Settings/Default.hs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index 312747141b..503d917981 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -105,7 +105,6 @@ stage0Packages = do ] ++ [ terminfo | not windowsHost, not cross ] ++ [ timeout | windowsHost ] - ++ [ touchy | windowsHost ] -- | Packages built in 'Stage1' by default. You can change this in "UserSettings". stage1Packages :: Action [Package] @@ -176,16 +175,14 @@ defaultLibraryWays = Set.fromList <$> defaultRtsWays :: Ways defaultRtsWays = Set.fromList <$> mconcat - [ pure [vanilla] + [ pure [vanilla, threaded] , notStage0 ? pure - [ profiling, debugProfiling - , debug + [ profiling, threadedProfiling, debugProfiling, threadedDebugProfiling + , debug, threadedDebug ] - , notStage0 ? targetSupportsThreadedRts ? pure [threaded, threadedProfiling, threadedDebugProfiling, threadedDebug] , notStage0 ? platformSupportsSharedLibs ? pure - [ dynamic, debugDynamic + [ dynamic, threadedDynamic, debugDynamic, threadedDebugDynamic ] - , notStage0 ? platformSupportsSharedLibs ? targetSupportsThreadedRts ? pure [ threadedDynamic, threadedDebugDynamic ] ] -- TODO: Move C source arguments here |