git.iko.soy/stackage
on master help sign in
Merge branch 'master' into incremental
9598bf9Michael Snoyman
Stackage/BuildConstraints.hs+1−1
compare with master
unifiedsplit
@@ -120,7 +120,7 @@ instance FromJSON PackageConstraints where
120 pcBuildBenchmarks <- o .: "build-benchmarks"
120 pcBuildBenchmarks <- o .: "build-benchmarks"
121 pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags"
121 pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags"
122 pcMaintainer <- o .:? "maintainer"
122 pcMaintainer <- o .:? "maintainer"
123− pcEnableLibProfile <- fmap (fromMaybe False) (o .:? "library-profiling")
123+ pcEnableLibProfile <- fmap (fromMaybe True) (o .:? "library-profiling")
124 return PackageConstraints {..}
124 return PackageConstraints {..}
125
125
126-- | The proposed plan from the requirements provided by contributors.
126-- | The proposed plan from the requirements provided by contributors.
Stackage/CompleteBuild.hs+2
@@ -36,6 +36,7 @@ data BuildFlags = BuildFlags
36 , bfEnableHaddock :: !Bool
36 , bfEnableHaddock :: !Bool
37 , bfDoUpload :: !Bool
37 , bfDoUpload :: !Bool
38 , bfEnableLibProfile :: !Bool
38 , bfEnableLibProfile :: !Bool
39+ , bfEnableExecDyn :: !Bool
39 , bfVerbose :: !Bool
40 , bfVerbose :: !Bool
40 , bfSkipCheck :: !Bool
41 , bfSkipCheck :: !Bool
41 } deriving (Show)
42 } deriving (Show)
@@ -206,6 +207,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
206 , pbEnableTests = bfEnableTests buildFlags
207 , pbEnableTests = bfEnableTests buildFlags
207 , pbEnableHaddock = bfEnableHaddock buildFlags
208 , pbEnableHaddock = bfEnableHaddock buildFlags
208 , pbEnableLibProfiling = bfEnableLibProfile buildFlags
209 , pbEnableLibProfiling = bfEnableLibProfile buildFlags
210+ , pbEnableExecDyn = bfEnableExecDyn buildFlags
209 , pbVerbose = bfVerbose buildFlags
211 , pbVerbose = bfVerbose buildFlags
210 , pbAllowNewer = bfSkipCheck buildFlags
212 , pbAllowNewer = bfSkipCheck buildFlags
211 }
213 }
Stackage/InstallBuild.hs+2
@@ -30,6 +30,7 @@ data InstallFlags = InstallFlags
30 , ifEnableTests :: !Bool
30 , ifEnableTests :: !Bool
31 , ifEnableHaddock :: !Bool
31 , ifEnableHaddock :: !Bool
32 , ifEnableLibProfiling :: !Bool
32 , ifEnableLibProfiling :: !Bool
33+ , ifEnableExecDyn :: !Bool
33 , ifVerbose :: !Bool
34 , ifVerbose :: !Bool
34 , ifSkipCheck :: !Bool
35 , ifSkipCheck :: !Bool
35 } deriving (Show)
36 } deriving (Show)
@@ -51,6 +52,7 @@ getPerformBuild plan InstallFlags{..} =
51 , pbEnableTests = ifEnableTests
52 , pbEnableTests = ifEnableTests
52 , pbEnableHaddock = ifEnableHaddock
53 , pbEnableHaddock = ifEnableHaddock
53 , pbEnableLibProfiling = ifEnableLibProfiling
54 , pbEnableLibProfiling = ifEnableLibProfiling
55+ , pbEnableExecDyn = ifEnableExecDyn
54 , pbVerbose = ifVerbose
56 , pbVerbose = ifVerbose
55 , pbAllowNewer = ifSkipCheck
57 , pbAllowNewer = ifSkipCheck
56 }
58 }
Stackage/PerformBuild.hs+2
@@ -65,6 +65,7 @@ data PerformBuild = PerformBuild
65 , pbEnableTests :: Bool
65 , pbEnableTests :: Bool
66 , pbEnableHaddock :: Bool
66 , pbEnableHaddock :: Bool
67 , pbEnableLibProfiling :: Bool
67 , pbEnableLibProfiling :: Bool
68+ , pbEnableExecDyn :: Bool
68 , pbVerbose :: Bool
69 , pbVerbose :: Bool
69 , pbAllowNewer :: Bool
70 , pbAllowNewer :: Bool
70 -- ^ Pass --allow-newer to cabal configure
71 -- ^ Pass --allow-newer to cabal configure
@@ -334,6 +335,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
334 tell' $ "--flags=" ++ flags
335 tell' $ "--flags=" ++ flags
335 when (pbEnableLibProfiling && pcEnableLibProfile) $
336 when (pbEnableLibProfiling && pcEnableLibProfile) $
336 tell' "--enable-library-profiling"
337 tell' "--enable-library-profiling"
338+ when pbEnableExecDyn $ tell' "--enable-executable-dynamic"
337 where
339 where
338 tell' x = tell (x:)
340 tell' x = tell (x:)
339
341
app/stackage.hs+6
@@ -90,6 +90,9 @@ main =
90 switch
90 switch
91 (long "enable-library-profiling" <>
91 (long "enable-library-profiling" <>
92 help "Enable profiling when building") <*>
92 help "Enable profiling when building") <*>
93+ switch
94+ (long "enable-executable-dynamic" <>
95+ help "Enable dynamic executables when building") <*>
93 switch
96 switch
94 (long "verbose" <> short 'v' <>
97 (long "verbose" <> short 'v' <>
95 help "Output verbose detail about the build steps") <*>
98 help "Output verbose detail about the build steps") <*>
@@ -149,6 +152,9 @@ main =
149 switch
152 switch
150 (long "enable-library-profiling" <>
153 (long "enable-library-profiling" <>
151 help "Enable profiling when building") <*>
154 help "Enable profiling when building") <*>
155+ switch
156+ (long "enable-executable-dynamic" <>
157+ help "Enable dynamic executables when building") <*>
152 switch
158 switch
153 (long "verbose" <> short 'v' <>
159 (long "verbose" <> short 'v' <>
154 help "Output verbose detail about the build steps") <*>
160 help "Output verbose detail about the build steps") <*>