Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Also install dynamically linked executable (when present)
  • Loading branch information
clefru committed Oct 6, 2008
1 parent 7b47981 commit d1700ce
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions Distribution/Simple/GHC.hs
Expand Up @@ -894,10 +894,17 @@ installExe flags lbi installDirs pretendInstallDirs buildPref (progprefix, progs
createDirectoryIfMissingVerbose verbosity True binDir
withExe pkg_descr $ \Executable { exeName = e } -> do
let exeFileName = e <.> exeExtension
exeDynFileName = e <.> "dyn" <.> exeExtension
fixedExeBaseName = progprefix ++ e ++ progsuffix
installBinary dest = do
copyFileVerbose verbosity
(buildPref </> e </> exeFileName) dest
(buildPref </> e </> exeFileName) (dest <.> exeExtension)
exists <- doesFileExist (buildPref </> e </> exeDynFileName)
if exists then
copyFileVerbose verbosity
(buildPref </> e </> exeDynFileName) (dest <.> "dyn" <.> exeExtension)
else
return ()
stripExe verbosity lbi exeFileName dest
if useWrapper
then do
Expand All @@ -915,7 +922,7 @@ installExe flags lbi installDirs pretendInstallDirs buildPref (progprefix, progs
: fullPathTemplateEnv myPkgId myCompilerId
pretendInstallDirs
createDirectoryIfMissingVerbose verbosity True libExecDir
installBinary absExeFileName
installBinary (libExecDir </> fixedExeBaseName)
-- XXX Should probably look somewhere more sensible
-- than just . for wrappers
wrapperTemplate <- readFile (e <.> "wrapper")
Expand All @@ -925,9 +932,7 @@ installExe flags lbi installDirs pretendInstallDirs buildPref (progprefix, progs
writeFileAtomic wrapperFileName wrapper
copyPermissions absExeFileName wrapperFileName
else do
let absExeFileName =
binDir </> fixedExeBaseName <.> exeExtension
installBinary absExeFileName
installBinary (binDir </> fixedExeBaseName)

stripExe :: Verbosity -> LocalBuildInfo -> FilePath -> FilePath -> IO ()
stripExe verbosity lbi name path = when (stripExes lbi) $
Expand Down

0 comments on commit d1700ce

Please sign in to comment.