Skip to content

fix: add platform-specific executable extension to build output paths #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stable-haskell/feature/cross-compile
Choose a base branch
from
Open

fix: add platform-specific executable extension to build output paths #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions cabal-install/src/Distribution/Client/ProjectOrchestration.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,12 @@ import Distribution.Utils.LogProgress
import Distribution.Utils.NubList
( fromNubList
)
import Distribution.Utils.Path (makeSymbolicPath, (</>))
import Distribution.Utils.Path (makeSymbolicPath, (</>), (<.>))
import Distribution.Verbosity
#ifdef MIN_VERSION_unix
import System.Posix.Signals (sigKILL, sigSEGV)

import System.Posix.Signals (sigKILL, sigSEGV)
#endif
import Distribution.Simple.BuildPaths (exeExtension)

-- | Tracks what command is being executed, because we need to hide this somewhere
-- for cases that need special handling (usually for error reporting).
Expand Down Expand Up @@ -545,9 +545,12 @@ installExecutables
, pkg `Set.member` packagesDefinitelyUpToDate postBuildStatus
, Just (InstallPlan.Configured elab) <- [InstallPlan.lookup elaboratedPlanOriginal pkg]
, (ComponentTarget (CExeName cname) _subtarget, _targetSelectors) <- targets
, let exe = unUnqualComponentName cname
, let dir = binDirectoryFor distDirLayout elaboratedShared elab exe
, let platform = toolchainPlatform (getStage toolchains (elabStage elab))
, let exeName = unUnqualComponentName cname
, let dir = binDirectoryFor distDirLayout elaboratedShared elab exeName
, let exe = exeName <.> exeExtension platform
]
toolchains = pkgConfigToolchains elaboratedShared

-- Note that it is a deliberate design choice that the 'buildTargets' is
-- not passed to phase 1, and the various bits of input config is not
Expand Down
Loading