git.iko.soy/stackage
on master help sign in
Default build flags available
commit5a410bf8966fedcbf4c88edfc18cea94104cf6a0 authorMichael Snoyman <michael@snoyman.com> dateMon 17 Dec 2012, 15:19 (14 years ago) parentd4432cd
4 files changed+11−5
compare with master
unifiedsplit
Stackage/Build.hs+1 Stackage/InstallInfo.hs+1−1 Stackage/LoadDatabase.hs+7−4 Stackage/Types.hs+2
Stackage/Build.hs+1
@@ -40,6 +40,7 @@ defaultBuildSettings = BuildSettings
4040 , cleanBeforeBuild = True
4141 , excludedPackages = empty
4242 , testWorkerThreads = 4
43+ , flags = Set.fromList $ words "blaze_html_0_5"
4344 }
4445
4546build :: BuildSettings -> IO ()
Stackage/InstallInfo.hs+1−1
@@ -31,7 +31,7 @@ getInstallInfo settings = do
3131 | otherwise = stablePackages settings
3232 allPackages = dropExcluded settings allPackages'
3333 let totalCore = extraCore settings `Set.union` Set.map (\(PackageIdentifier p _) -> p) (hpcore hp)
34− pdb <- loadPackageDB totalCore allPackages
34+ pdb <- loadPackageDB settings totalCore allPackages
3535 final <- narrowPackageDB pdb $ Set.fromList $ Map.toList $ Map.map snd $ allPackages
3636
3737 putStrLn "Printing build plan to build-plan.log"
Stackage/LoadDatabase.hs+7−4
@@ -26,7 +26,8 @@ import Distribution.PackageDescription (Condition (..),
2626 genPackageFlags,
2727 libBuildInfo,
2828 packageDescription,
29− testBuildInfo)
29+ testBuildInfo,
30+ FlagName (FlagName))
3031import Distribution.PackageDescription.Parse (ParseResult (ParseOk),
3132 parsePackageDescription)
3233import Distribution.System (buildArch, buildOS)
@@ -46,10 +47,11 @@ import Stackage.Util
4647-- version.
4748--
4849-- * For other packages, select the maximum version number.
49−loadPackageDB :: Set PackageName -- ^ core packages
50+loadPackageDB :: BuildSettings
51+ -> Set PackageName -- ^ core packages
5052 -> Map PackageName (VersionRange, Maintainer) -- ^ additional deps
5153 -> IO PackageDB
52−loadPackageDB core deps = do
54+loadPackageDB settings core deps = do
5355 tarName <- getTarballName
5456 lbs <- L.readFile tarName
5557 addEntries mempty $ Tar.read lbs
@@ -119,4 +121,5 @@ loadPackageDB core deps = do
119121 checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2
120122 checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2
121123
122− flags = map flagName $ filter flagDefault $ genPackageFlags gpd
124+ flags = map flagName (filter flagDefault $ genPackageFlags gpd) ++
125+ (map FlagName $ Set.toList $ Stackage.Types.flags settings)
Stackage/Types.hs+2
@@ -79,4 +79,6 @@ data BuildSettings = BuildSettings
7979 -- packages are dependencies of others, they will still be included.
8080 , testWorkerThreads :: Int
8181 -- ^ How many threads to spawn for running test suites.
82+ , flags :: Set String
83+ -- ^ Compile flags which should be turned on.
8284 }