Skip to content

Fix build for new GHC #49

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
parsonsmatt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build for new GHC #49

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dist
dist-newstyle/
cabal.sandbox.config
.cabal-sandbox
.stack-work
Expand Down
13 changes: 10 additions & 3 deletions Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{- OPTIONS_GHC -Wall #-}

#ifndef MIN_VERSION_Cabal
#define MIN_VERSION_Cabal(x,y,z) 0
#define MIN_VERSION_Cabal(x,y,z) 0
#endif

import Control.Exception (IOException, catch)
Expand All @@ -17,6 +17,13 @@ import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Program
import Distribution.Verbosity

#if MIN_VERSION_Cabal(3,14,0)
import Distribution.Utils.Path (makeSymbolicPath)
#else
makeSymbolicPath :: String -> String
makeSymbolicPath = id
#endif

-- A Cabal 1.16 vs 1.18 compatibility hack, as in 1.18
-- findProgramLocation has a new (unused in this case) parameter.
-- ConstOrId adds this parameter when types say it is mandatory.
Expand Down Expand Up @@ -79,13 +86,13 @@ mysqlBuildInfo lbi = do
else []

return emptyBuildInfo {
extraLibDirs = map (drop 2) . filter ("-L" `isPrefixOf`) $
extraLibDirs = map (makeSymbolicPath . drop 2) . filter ("-L" `isPrefixOf`) $
nub (libsSys ++ libs)
, extraLibs = map (drop 2) . filter ("-l" `isPrefixOf`) .
filter (/= "-lmygcc") $
filter (/= "-lmysqlclient_r") $
nub (libsSys ++ libs ++ libsR)
, includeDirs = map (drop 2) include
, includeDirs = map (makeSymbolicPath . drop 2) include
}
where
-- Recover from an error by returning an empty list.
Expand Down