Merge branch 'master' into incremental

Stackage/BuildConstraints.hs

@@ -120,7 +120,7 @@ instance FromJSON PackageConstraints where
         pcBuildBenchmarks <- o .: "build-benchmarks"
         pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags"
         pcMaintainer <- o .:? "maintainer"
-        pcEnableLibProfile <- fmap (fromMaybe False) (o .:? "library-profiling")
+        pcEnableLibProfile <- fmap (fromMaybe True) (o .:? "library-profiling")
         return PackageConstraints {..}
 
 -- | The proposed plan from the requirements provided by contributors.

Stackage/CompleteBuild.hs

@@ -36,6 +36,7 @@ data BuildFlags = BuildFlags
     , bfEnableHaddock    :: !Bool
     , bfDoUpload         :: !Bool
     , bfEnableLibProfile :: !Bool
+    , bfEnableExecDyn    :: !Bool
     , bfVerbose          :: !Bool
     , bfSkipCheck        :: !Bool
     } deriving (Show)
@@ -206,6 +207,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
     , pbEnableTests = bfEnableTests buildFlags
     , pbEnableHaddock = bfEnableHaddock buildFlags
     , pbEnableLibProfiling = bfEnableLibProfile buildFlags
+    , pbEnableExecDyn = bfEnableExecDyn buildFlags
     , pbVerbose = bfVerbose buildFlags
     , pbAllowNewer = bfSkipCheck buildFlags
     }

Stackage/InstallBuild.hs

@@ -30,6 +30,7 @@ data InstallFlags = InstallFlags
     , ifEnableTests        :: !Bool
     , ifEnableHaddock      :: !Bool
     , ifEnableLibProfiling :: !Bool
+    , ifEnableExecDyn      :: !Bool
     , ifVerbose            :: !Bool
     , ifSkipCheck          :: !Bool
     } deriving (Show)
@@ -51,6 +52,7 @@ getPerformBuild plan InstallFlags{..} =
     , pbEnableTests        = ifEnableTests
     , pbEnableHaddock      = ifEnableHaddock
     , pbEnableLibProfiling = ifEnableLibProfiling
+    , pbEnableExecDyn      = ifEnableExecDyn
     , pbVerbose            = ifVerbose
     , pbAllowNewer         = ifSkipCheck
     }

Stackage/PerformBuild.hs

@@ -65,6 +65,7 @@ data PerformBuild = PerformBuild
     , pbEnableTests        :: Bool
     , pbEnableHaddock      :: Bool
     , pbEnableLibProfiling :: Bool
+    , pbEnableExecDyn      :: Bool
     , pbVerbose            :: Bool
     , pbAllowNewer         :: Bool
     -- ^ Pass --allow-newer to cabal configure
@@ -334,6 +335,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
         tell' $ "--flags=" ++ flags
         when (pbEnableLibProfiling && pcEnableLibProfile) $
             tell' "--enable-library-profiling"
+        when pbEnableExecDyn $ tell' "--enable-executable-dynamic"
       where
         tell' x = tell (x:)
 

app/stackage.hs

@@ -90,6 +90,9 @@ main =
         switch
             (long "enable-library-profiling" <>
              help "Enable profiling when building") <*>
+        switch
+            (long "enable-executable-dynamic" <>
+             help "Enable dynamic executables when building") <*>
         switch
             (long "verbose" <> short 'v' <>
              help "Output verbose detail about the build steps") <*>
@@ -149,6 +152,9 @@ main =
         switch
             (long "enable-library-profiling" <>
              help "Enable profiling when building") <*>
+        switch
+            (long "enable-executable-dynamic" <>
+             help "Enable dynamic executables when building") <*>
         switch
             (long "verbose" <> short 'v' <>
              help "Output verbose detail about the build steps") <*>