[Git][ghc/ghc][wip/js-staging] fixup: forgot to remove now duplicate flavours

[doyougnu (@doyougnu)]

doyougnu pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
7d62ae49 by doyougnu at 2022-11-02T21:10:52-04:00
fixup: forgot to remove now duplicate flavours

- - - - -


2 changed files:

- hadrian/src/Settings/Flavours/QuickCross.hs
- hadrian/src/Way/Type.hs


Changes:

=====================================
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


=====================================
hadrian/src/Way/Type.hs
=====================================
@@ -1,6 +1,7 @@
 {-# LANGUAGE DerivingStrategies         #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase                 #-}
+
 module Way.Type where
 
 import Data.IntSet (IntSet)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7d62ae498948dd41d6deba5c78ec642898ecb743

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7d62ae498948dd41d6deba5c78ec642898ecb743
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221102/13ef4299/attachment-0001.html>