git.iko.soy/stackage
on master help sign in
disabledFlags
commit3b612807ecbd1e5458671d0f4209dc0412b5593c authorMichael Snoyman <michael@snoyman.com> dateWed 13 Feb 2013, 15:52 (14 years ago) parent7d7108b
3 files changed+6−1
compare with master
unifiedsplit
Stackage/LoadDatabase.hs+3−1 Stackage/Select.hs+1 Stackage/Types.hs+2
Stackage/LoadDatabase.hs+3−1
@@ -128,7 +128,9 @@ loadPackageDB settings core deps = do
128128 where
129129 checkCond' (Var (OS os)) = os == buildOS
130130 checkCond' (Var (Arch arch)) = arch == buildArch
131− checkCond' (Var (Flag flag)) = flag `elem` flags'
131+ checkCond' (Var (Flag flag@(FlagName flag'))) =
132+ flag' `Set.notMember` disabledFlags settings &&
133+ flag `elem` flags'
132134 checkCond' (Var (Impl compiler range)) =
133135 compiler == GHC && withinRange targetCompilerVersion range
134136 checkCond' (Lit b) = b
Stackage/Select.hs+1
@@ -23,6 +23,7 @@ defaultSelectSettings = SelectSettings
2323 , requireHaskellPlatform = True
2424 , excludedPackages = empty
2525 , flags = Set.fromList $ words "blaze_html_0_5"
26+ , disabledFlags = Set.fromList $ words "bytestring-in-base"
2627 , allowedPackage = const $ Right ()
2728 , useGlobalDatabase = False
2829 }
Stackage/Types.hs+2
@@ -93,6 +93,8 @@ data SelectSettings = SelectSettings
9393 { haskellPlatformCabal :: FilePath
9494 , flags :: Set String
9595 -- ^ Compile flags which should be turned on.
96+ , disabledFlags :: Set String
97+ -- ^ Compile flags which should always be disabled.
9698 , extraCore :: Set PackageName
9799 , requireHaskellPlatform :: Bool
98100 , allowedPackage :: GenericPackageDescription -> Either String ()