From 05779678c57d1a559f954b347cd96be9d98e2328 Mon Sep 17 00:00:00 2001 From: Fendor Date: Fri, 30 Jul 2021 12:35:25 +0200 Subject: [PATCH] Add build-info location to plan.json --- cabal-install/src/Distribution/Client/ProjectPlanOutput.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cabal-install/src/Distribution/Client/ProjectPlanOutput.hs b/cabal-install/src/Distribution/Client/ProjectPlanOutput.hs index 50a4e0e1bc0..95e4829861b 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanOutput.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanOutput.hs @@ -45,7 +45,7 @@ import Distribution.Simple.GHC , GhcEnvironmentFileEntry(..), simpleGhcEnvironmentFile , writeGhcEnvironmentFile ) import Distribution.Simple.BuildPaths - ( dllExtension, exeExtension ) + ( dllExtension, exeExtension, buildInfoPref ) import qualified Distribution.Compat.Graph as Graph import Distribution.Compat.Graph (Graph, Node) import qualified Distribution.Compat.Binary as Binary @@ -150,7 +150,9 @@ encodePlanAsJson distDirLayout elaboratedInstallPlan elaboratedSharedConfig = | Just hash <- [elabPkgSourceHash elab] ] ++ (case elabBuildStyle elab of BuildInplaceOnly -> - ["dist-dir" J..= J.String dist_dir] + [ "dist-dir" J..= J.String dist_dir + , "build-info" J..= J.String (buildInfoPref dist_dir) + ] BuildAndInstall -> -- TODO: install dirs? []