Merge pull request #10994 from mpickering/wip/profDyn

cabal-install: dynExe+profExe requires prof+dyn

Author: mergify[bot]

Cabal/src/Distribution/Simple/Compiler.hs

@@ -509,11 +509,13 @@ profilingVanillaSupported comp = waySupported "p" comp
 
 -- | Is the compiler distributed with profiling dynamic libraries
 profilingDynamicSupported :: Compiler -> Maybe Bool
-profilingDynamicSupported comp =
-  -- Certainly not before this version, as it was not implemented yet.
-  if compilerVersion comp <= mkVersion [9, 11, 0]
-    then Just False
-    else waySupported "p_dyn" comp
+profilingDynamicSupported comp
+  | GHC <- compilerFlavor comp
+  , -- Certainly not before 9.11, as prof+dyn was not implemented yet.
+    compilerVersion comp <= mkVersion [9, 11, 0] =
+      Just False
+  | otherwise =
+      waySupported "p_dyn" comp
 
 -- | Either profiling dynamic is definitely supported or we don't know (so assume
 -- it is)

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

@@ -2316,10 +2316,15 @@ elaborateInstallPlan
                 { withVanillaLib = perPkgOptionFlag pkgid True packageConfigVanillaLib -- TODO: [required feature]: also needs to be handled recursively
                 , withSharedLib = canBuildSharedLibs && pkgid `Set.member` pkgsUseSharedLibrary
                 , withStaticLib = perPkgOptionFlag pkgid False packageConfigStaticLib
-                , withDynExe = perPkgOptionFlag pkgid False packageConfigDynExe
+                , withDynExe =
+                    perPkgOptionFlag pkgid False packageConfigDynExe
+                      -- We can't produce a dynamic executable if the user
+                      -- wants to enable executable profiling but the
+                      -- compiler doesn't support prof+dyn.
+                      && (okProfDyn || not profExe)
                 , withFullyStaticExe = perPkgOptionFlag pkgid False packageConfigFullyStaticExe
                 , withGHCiLib = perPkgOptionFlag pkgid False packageConfigGHCiLib -- TODO: [required feature] needs to default to enabled on windows still
-                , withProfExe = perPkgOptionFlag pkgid False packageConfigProf
+                , withProfExe = profExe
                 , withProfLib = canBuildProfilingLibs && pkgid `Set.member` pkgsUseProfilingLibrary
                 , withProfLibShared = canBuildProfilingSharedLibs && pkgid `Set.member` pkgsUseProfilingLibraryShared
                 , exeCoverage = perPkgOptionFlag pkgid False packageConfigCoverage
@@ -2334,6 +2339,8 @@ elaborateInstallPlan
                 , withProfLibDetail = elabProfExeDetail
                 , withProfExeDetail = elabProfLibDetail
                 }
+            okProfDyn = profilingDynamicSupportedOrUnknown compiler
+            profExe = perPkgOptionFlag pkgid False packageConfigProf
 
             ( elabProfExeDetail
               , elabProfLibDetail