Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • hadrian/src/Settings/Flavours/Validate.hs
    1 1
     module Settings.Flavours.Validate (validateFlavour, slowValidateFlavour,
    
    2 2
                                         quickValidateFlavour) where
    
    3 3
     
    
    4
    -import qualified Data.Set as Set
    
    5 4
     
    
    6 5
     import Expression
    
    7 6
     import Flavour
    
    8
    -import Oracles.Flag
    
    9 7
     import {-# SOURCE #-} Settings.Default
    
    10 8
     
    
    11 9
     -- Please update doc/flavours.md when changing this file.
    
    12 10
     validateFlavour :: Flavour
    
    13
    -validateFlavour = enableLinting $ werror $ defaultFlavour
    
    11
    +validateFlavour = enableLinting $ quickValidateFlavour
    
    14 12
         { name = "validate"
    
    15 13
         , extraArgs = validateArgs <> defaultHaddockExtraArgs
    
    16
    -    , libraryWays = Set.fromList <$>
    
    17
    -                    mconcat [ pure [vanilla]
    
    18
    -                            , notStage0 ? platformSupportsSharedLibs ? pure [dynamic]
    
    19
    -                            ]
    
    20
    -    , rtsWays = Set.fromList <$>
    
    21
    -                mconcat [ pure [vanilla, debug]
    
    22
    -                        , targetSupportsThreadedRts ? pure [threaded, threadedDebug]
    
    23
    -                        , notStage0 ? platformSupportsSharedLibs ? pure
    
    24
    -                            [ dynamic, debugDynamic
    
    25
    -                            ]
    
    26
    -                        , notStage0 ? platformSupportsSharedLibs ? targetSupportsThreadedRts ? pure
    
    27
    -                            [ threadedDynamic, threadedDebugDynamic ]
    
    28
    -                        ]
    
    29 14
         , ghcDebugAssertions = (<= Stage1)
    
    30 15
         }
    
    31 16
     
    
    ... ... @@ -59,6 +44,6 @@ quickValidateArgs = sourceArgs SourceArgs
    59 44
         }
    
    60 45
     
    
    61 46
     quickValidateFlavour :: Flavour
    
    62
    -quickValidateFlavour = werror $ validateFlavour
    
    47
    +quickValidateFlavour = werror $ disableProfiledLibs $ defaultFlavour
    
    63 48
         { name               = "quick-validate"
    
    64 49
         , extraArgs               = quickValidateArgs }