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

Jump to bottom

[llvm-3.5] Support GHCi and TH #199

Open
wants to merge 2 commits into
base: llvm-3.5
Choose a base branch
from
Open

[llvm-3.5] Support GHCi and TH #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a00e733
Support GHCi and TH
tmcdonell Jan 10, 2017
ef6b781
Reenable support for Cabal<1.22
tmcdonell Jan 10, 2017
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
39 changes: 34 additions & 5 deletions llvm-general/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TemplateHaskell #-}

import Control.Exception (SomeException, try)
import Control.Monad
import Data.Maybe
Expand All @@ -8,15 +10,17 @@ import qualified Data.Map as Map
import Data.Monoid
import Data.Char
import Distribution.Simple
import Distribution.Simple.Utils (cabalVersion)
import Distribution.Simple.PreProcess
import Distribution.Simple.Program
import Distribution.Simple.Setup hiding (Flag)
import Distribution.Simple.LocalBuildInfo
import Distribution.System
import Distribution.PackageDescription
import Distribution.Version
import System.Environment
import System.SetEnv
import Distribution.System
import Language.Haskell.TH

-- define these selectively in C files (where _not_ using HsFFI.h),
-- rather than universally in the ccOptions, because HsFFI.h currently defines them
Expand Down Expand Up @@ -93,6 +97,22 @@ addToLdLibraryPath path = do
v <- try $ getEnv ldLibraryPathVar :: IO (Either SomeException String)
setEnv ldLibraryPathVar (path ++ either (const "") (ldLibraryPathSep ++) v)


addLibs :: [String] -> BuildInfo -> BuildInfo
addLibs libs bi = bi { extraLibs = libs }

-- 'extraGHCiLibs' is only available in Cabal-1.22 and later. Since GHC<8.0
-- provides no mechanism to test which version of the Cabal library we are
-- compiling against, use TH tricky instead.
addGHCiLibs :: [String] -> BuildInfo -> BuildInfo
addGHCiLibs libs bi =
$( case withinRange cabalVersion (orLaterVersion (Version [1,22] [])) of
-- Not supported with old versions of Cabal; return BuildInfo unmodified
False -> return $ VarE (mkName "bi")
-- 'bi { extraGHCiLibs = libs }'
True -> return $ RecUpdE (VarE (mkName "bi")) [(mkName "extraGHCiLibs", VarE (mkName "libs"))]
)

addLLVMToLdLibraryPath :: ConfigFlags -> IO ()
addLLVMToLdLibraryPath configFlags = do
llvmConfig <- getLLVMConfig configFlags
Expand Down Expand Up @@ -120,7 +140,10 @@ main = do
staticLibs <- liftM (map (fromJust . stripPrefix "-l") . words) $ llvmConfig "--libs"
systemLibs <- liftM (map (fromJust . stripPrefix "-l") . words) $ llvmConfig "--system-libs"

let genericPackageDescription' = genericPackageDescription {
let staticLibs' = staticLibs ++ systemLibs
sharedLibs' = sharedLib : systemLibs

genericPackageDescription' = genericPackageDescription {
condLibrary = do
libraryCondTree <- condLibrary genericPackageDescription
return libraryCondTree {
Expand All @@ -130,10 +153,16 @@ main = do
condTreeComponents = condTreeComponents libraryCondTree ++ [
(
Var (Flag (FlagName "shared-llvm")),
CondNode (mempty { libBuildInfo = mempty { extraLibs = [sharedLib] ++ systemLibs } }) [] [],
Just (CondNode (mempty { libBuildInfo = mempty { extraLibs = staticLibs ++ systemLibs } }) [] [])
-- With flag '-fshared-llvm':
-- * always link against shared library
CondNode (mempty { libBuildInfo = addLibs sharedLibs' mempty }) [] [],
-- Without '-fshared-llvm':
-- * executables are statically linked
-- * GHCi and TH use the shared library
Just (CondNode (mempty { libBuildInfo = addLibs staticLibs'
$ addGHCiLibs sharedLibs' mempty }) [] [])
)
]
]
}
}
configFlags' = configFlags {
Expand Down