Skip to content
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

Don't send non-existent extra-lib-dirs to ghc #8510

Merged
merged 3 commits into from
Jan 6, 2023
Merged

Don't send non-existent extra-lib-dirs to ghc #8510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd37fd5
don't send non-extant extra-lib-dirs to ghc #6492
gbaz Oct 3, 2022
2a6e7fc
changelog
gbaz Oct 21, 2022
4c07a64
Merge branch 'master' into gb/no-bad-extra-lib-dirs
mergify[bot] Jan 5, 2023
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
25 changes: 18 additions & 7 deletions Cabal/src/Distribution/Simple/GHC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ import Control.Monad (msum, forM_)
import Data.Char (isLower)
import qualified Data.Map as Map
import System.Directory
( doesFileExist, getAppUserDataDirectory, createDirectoryIfMissing
( doesFileExist, doesDirectoryExist
, getAppUserDataDirectory, createDirectoryIfMissing
, canonicalizePath, removeFile, renameFile, getDirectoryContents
, makeRelativeToCurrentDirectory )
import System.FilePath ( (</>), (<.>), takeExtension
Expand Down Expand Up @@ -532,6 +533,11 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do

let libBi = libBuildInfo lib

-- ensure extra lib dirs exist before passing to ghc
cleanedExtraLibDirs <- filterM doesDirectoryExist (extraLibDirs libBi)
cleanedExtraLibDirsStatic <- filterM doesDirectoryExist (extraLibDirsStatic libBi)


let isGhcDynamic = isDynamic comp
dynamicTooSupported = supportsDynamicToo comp
doingTH = usesTemplateHaskellOrQQ libBi
Expand Down Expand Up @@ -602,8 +608,8 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do
else extraLibs libBi,
ghcOptLinkLibPath = toNubListR $
if withFullyStaticExe lbi
then extraLibDirsStatic libBi
else extraLibDirs libBi,
then cleanedExtraLibDirsStatic
else cleanedExtraLibDirs,
ghcOptLinkFrameworks = toNubListR $ PD.frameworks libBi,
ghcOptLinkFrameworkDirs = toNubListR $
PD.extraFrameworkDirs libBi,
Expand Down Expand Up @@ -892,7 +898,7 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do
ghcOptPackages = toNubListR $
Internal.mkGhcOptPackages clbi ,
ghcOptLinkLibs = extraLibs libBi,
ghcOptLinkLibPath = toNubListR $ extraLibDirs libBi,
ghcOptLinkLibPath = toNubListR $ cleanedExtraLibDirs,
ghcOptLinkFrameworks = toNubListR $ PD.frameworks libBi,
ghcOptLinkFrameworkDirs =
toNubListR $ PD.extraFrameworkDirs libBi,
Expand Down Expand Up @@ -926,7 +932,7 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do
ghcOptPackages = toNubListR $
Internal.mkGhcOptPackages clbi ,
ghcOptLinkLibs = extraLibs libBi,
ghcOptLinkLibPath = toNubListR $ extraLibDirs libBi
ghcOptLinkLibPath = toNubListR $ cleanedExtraLibDirs
}

info verbosity (show (ghcOptPackages ghcSharedLinkArgs))
Expand Down Expand Up @@ -1318,6 +1324,11 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
rpaths <- getRPaths lbi clbi
buildSources <- gbuildSources verbosity (package pkg_descr) (specVersion pkg_descr) tmpDir bm

-- ensure extra lib dirs exist before passing to ghc
cleanedExtraLibDirs <- filterM doesDirectoryExist (extraLibDirs bnfo)
cleanedExtraLibDirsStatic <- filterM doesDirectoryExist (extraLibDirsStatic bnfo)


let cSrcs = cSourcesFiles buildSources
cxxSrcs = cxxSourceFiles buildSources
inputFiles = inputSourceFiles buildSources
Expand Down Expand Up @@ -1382,8 +1393,8 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
else extraLibs bnfo,
ghcOptLinkLibPath = toNubListR $
if withFullyStaticExe lbi
then extraLibDirsStatic bnfo
else extraLibDirs bnfo,
then cleanedExtraLibDirsStatic
else cleanedExtraLibDirs,
ghcOptLinkFrameworks = toNubListR $
PD.frameworks bnfo,
ghcOptLinkFrameworkDirs = toNubListR $
Expand Down
8 changes: 8 additions & 0 deletions changelog.d/pr-8510
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
synopsis: don't send non-extant extra-lib-dirs to ghc
packages: Cabal
prs: #8510
issues: #6492

description: {
If an extra-libs-dir does not exist, it does not get sent to ghc, which can error on windows.
}