git.iko.soy/stackage
on master help sign in
Merge branch 'master' into incremental
commit9598bf9a3c78d3ea0f8f7a4c6b5ea58c73945be8 authorMichael Snoyman <michael@snoyman.com> dateFri 13 Mar 2015, 08:52 (12 years ago) parentcd0e717ca28a53
5 files changed+13−1
compare with master
unifiedsplit
Stackage/BuildConstraints.hs+1−1 Stackage/CompleteBuild.hs+2 Stackage/InstallBuild.hs+2 Stackage/PerformBuild.hs+2 app/stackage.hs+6
Stackage/BuildConstraints.hs+1−1
@@ -120,7 +120,7 @@ instance FromJSON PackageConstraints where
120120 pcBuildBenchmarks <- o .: "build-benchmarks"
121121 pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags"
122122 pcMaintainer <- o .:? "maintainer"
123− pcEnableLibProfile <- fmap (fromMaybe False) (o .:? "library-profiling")
123+ pcEnableLibProfile <- fmap (fromMaybe True) (o .:? "library-profiling")
124124 return PackageConstraints {..}
125125
126126-- | The proposed plan from the requirements provided by contributors.
Stackage/CompleteBuild.hs+2
@@ -36,6 +36,7 @@ data BuildFlags = BuildFlags
3636 , bfEnableHaddock :: !Bool
3737 , bfDoUpload :: !Bool
3838 , bfEnableLibProfile :: !Bool
39+ , bfEnableExecDyn :: !Bool
3940 , bfVerbose :: !Bool
4041 , bfSkipCheck :: !Bool
4142 } deriving (Show)
@@ -206,6 +207,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
206207 , pbEnableTests = bfEnableTests buildFlags
207208 , pbEnableHaddock = bfEnableHaddock buildFlags
208209 , pbEnableLibProfiling = bfEnableLibProfile buildFlags
210+ , pbEnableExecDyn = bfEnableExecDyn buildFlags
209211 , pbVerbose = bfVerbose buildFlags
210212 , pbAllowNewer = bfSkipCheck buildFlags
211213 }
Stackage/InstallBuild.hs+2
@@ -30,6 +30,7 @@ data InstallFlags = InstallFlags
3030 , ifEnableTests :: !Bool
3131 , ifEnableHaddock :: !Bool
3232 , ifEnableLibProfiling :: !Bool
33+ , ifEnableExecDyn :: !Bool
3334 , ifVerbose :: !Bool
3435 , ifSkipCheck :: !Bool
3536 } deriving (Show)
@@ -51,6 +52,7 @@ getPerformBuild plan InstallFlags{..} =
5152 , pbEnableTests = ifEnableTests
5253 , pbEnableHaddock = ifEnableHaddock
5354 , pbEnableLibProfiling = ifEnableLibProfiling
55+ , pbEnableExecDyn = ifEnableExecDyn
5456 , pbVerbose = ifVerbose
5557 , pbAllowNewer = ifSkipCheck
5658 }
Stackage/PerformBuild.hs+2
@@ -65,6 +65,7 @@ data PerformBuild = PerformBuild
6565 , pbEnableTests :: Bool
6666 , pbEnableHaddock :: Bool
6767 , pbEnableLibProfiling :: Bool
68+ , pbEnableExecDyn :: Bool
6869 , pbVerbose :: Bool
6970 , pbAllowNewer :: Bool
7071 -- ^ Pass --allow-newer to cabal configure
@@ -334,6 +335,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
334335 tell' $ "--flags=" ++ flags
335336 when (pbEnableLibProfiling && pcEnableLibProfile) $
336337 tell' "--enable-library-profiling"
338+ when pbEnableExecDyn $ tell' "--enable-executable-dynamic"
337339 where
338340 tell' x = tell (x:)
339341
app/stackage.hs+6
@@ -90,6 +90,9 @@ main =
9090 switch
9191 (long "enable-library-profiling" <>
9292 help "Enable profiling when building") <*>
93+ switch
94+ (long "enable-executable-dynamic" <>
95+ help "Enable dynamic executables when building") <*>
9396 switch
9497 (long "verbose" <> short 'v' <>
9598 help "Output verbose detail about the build steps") <*>
@@ -149,6 +152,9 @@ main =
149152 switch
150153 (long "enable-library-profiling" <>
151154 help "Enable profiling when building") <*>
155+ switch
156+ (long "enable-executable-dynamic" <>
157+ help "Enable dynamic executables when building") <*>
152158 switch
153159 (long "verbose" <> short 'v' <>
154160 help "Output verbose detail about the build steps") <*>