diff options
author | doyougnu <jeffrey.young@iohk.io> | 2022-11-02 21:10:52 -0400 |
---|---|---|
committer | Sylvain Henry <sylvain@haskus.fr> | 2022-11-07 12:00:41 +0100 |
commit | 510d240a8bf0a955cd8a6dde158b0c7cc571fa17 (patch) | |
tree | a5ffe74faed507b85ca9a527695110d8886ae287 | |
parent | 83752133f4c7dc76f7b01079ac7d9f9b55e2ef77 (diff) | |
download | haskell-510d240a8bf0a955cd8a6dde158b0c7cc571fa17.tar.gz |
fixup: forgot to remove now duplicate flavours
-rw-r--r-- | hadrian/src/Settings/Flavours/QuickCross.hs | 39 | ||||
-rw-r--r-- | hadrian/src/Way/Type.hs | 1 |
2 files changed, 2 insertions, 38 deletions
diff --git a/hadrian/src/Settings/Flavours/QuickCross.hs b/hadrian/src/Settings/Flavours/QuickCross.hs index 064fee37de..45e23402e4 100644 --- a/hadrian/src/Settings/Flavours/QuickCross.hs +++ b/hadrian/src/Settings/Flavours/QuickCross.hs @@ -1,4 +1,4 @@ -module Settings.Flavours.QuickCross (quickCrossFlavour, quickJsFlavour, perfJsFlavour) where +module Settings.Flavours.QuickCross (quickCrossFlavour) where import qualified Data.Set as Set @@ -7,43 +7,6 @@ import Flavour import Oracles.Flag import {-# SOURCE #-} Settings.Default -quickJsFlavour :: Flavour -quickJsFlavour = defaultFlavour - { name = "quick-js" - , args = defaultBuilderArgs <> quickJsArgs <> defaultPackageArgs - , dynamicGhcPrograms = pure False - , libraryWays = pure $ Set.singleton vanilla - , rtsWays = pure $ Set.singleton vanilla - } - -perfJsFlavour :: Flavour -perfJsFlavour = defaultFlavour - { name = "perf-js" - , args = defaultBuilderArgs <> perfJsArgs <> defaultPackageArgs - , dynamicGhcPrograms = pure False - , libraryWays = pure $ Set.singleton vanilla - , rtsWays = pure $ Set.singleton vanilla - } - -quickJsArgs :: Args -quickJsArgs = sourceArgs SourceArgs - { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] - ] - , hsLibrary = notStage0 ? mconcat [ arg "-O" ] - , hsCompiler = stage0 ? arg "-O2" - , hsGhc = mconcat - [ stage0 ? arg "-O" - , stage1 ? mconcat [ arg "-O0" ] ] } - -perfJsArgs :: Args -perfJsArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ arg "-O2", arg "-H64m"] - , hsLibrary = arg "-O2" - , hsCompiler = arg "-O2" - , hsGhc = arg "-O2" - } - -- Please update doc/flavours.md when changing this file. quickCrossFlavour :: Flavour quickCrossFlavour = defaultFlavour diff --git a/hadrian/src/Way/Type.hs b/hadrian/src/Way/Type.hs index 8a93ceddb3..22865717eb 100644 --- a/hadrian/src/Way/Type.hs +++ b/hadrian/src/Way/Type.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-} + module Way.Type where import Data.IntSet (IntSet) |