Fix --program-suffix resulting in invalid symlink

haskell · May 25, 2024 · 0e47036 · 0e47036
1 parent a6b99b8
commit 0e47036
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cabal-install/src/Distribution/Client/CmdInstall.hs b/cabal-install/src/Distribution/Client/CmdInstall.hs
@@ -540,7 +540,9 @@ installAction flags@NixStyleFlags{extraFlags, configFlags, installFlags, project
         -- BuildOutcomes because we also need the component names
           traverseInstall (installCheckUnitExes InstallCheckInstall) installCfg
   where
-    configFlags' = disableTestsBenchsByDefault configFlags
+    -- Filter `configProgSuffix` out, in order to get the canonical executable
+    -- in the store.
+    configFlags' = (disableTestsBenchsByDefault configFlags){configProgSuffix = NoFlag}
     verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags')
     ignoreProject = flagIgnoreProject projectFlags
     cliConfig =

diff --git a/changelog.d/issue-9919 b/changelog.d/issue-9919
@@ -0,0 +1,4 @@
+synopsis: Fix --program-suffix resulting in invalid symlink
+packages: cabal-install
+issues: #9919
+prs: #10056