Skip to content

Commit 023404c

Browse files
committed
"Build profile" now reflects optimization level set in global config
It still reports local config's optimization level if it was set. Fix #8487.
1 parent 182e2c1 commit 023404c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cabal-install/src/Distribution/Client/ProjectOrchestration.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,8 +862,10 @@ printPlan verbosity
862862
ProjectBaseContext {
863863
buildSettings = BuildTimeSettings{buildSettingDryRun},
864864
projectConfig = ProjectConfig {
865+
projectConfigAllPackages =
866+
PackageConfig {packageConfigOptimization = globalOpt},
865867
projectConfigLocalPackages =
866-
PackageConfig {packageConfigOptimization}
868+
PackageConfig {packageConfigOptimization = localOpt}
867869
}
868870
}
869871
ProjectBuildContext {
@@ -997,7 +999,7 @@ printPlan verbosity
997999
showBuildProfile :: String
9981000
showBuildProfile = "Build profile: " ++ unwords [
9991001
"-w " ++ (showCompilerId . pkgConfigCompiler) elaboratedShared,
1000-
"-O" ++ (case packageConfigOptimization of
1002+
"-O" ++ (case globalOpt <> localOpt of -- if local is not set, read global
10011003
Setup.Flag NoOptimisation -> "0"
10021004
Setup.Flag NormalOptimisation -> "1"
10031005
Setup.Flag MaximumOptimisation -> "2"

0 commit comments

Comments
 (0)