hlint hack.
This commit is contained in:
parent
fb08870d72
commit
992013df05
@ -122,10 +122,10 @@ getGHCOptions ghcopts cradle cdir binfo = do
|
|||||||
cabalCppOptions :: FilePath -> IO [String]
|
cabalCppOptions :: FilePath -> IO [String]
|
||||||
cabalCppOptions dir = do
|
cabalCppOptions dir = do
|
||||||
exist <- doesFileExist cabalMacro
|
exist <- doesFileExist cabalMacro
|
||||||
if exist then
|
return $ if exist then
|
||||||
return ["-include", cabalMacro]
|
["-include", cabalMacro]
|
||||||
else
|
else
|
||||||
return []
|
[]
|
||||||
where
|
where
|
||||||
cabalMacro = dir </> "dist/build/autogen/cabal_macros.h"
|
cabalMacro = dir </> "dist/build/autogen/cabal_macros.h"
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ cabalAllBuildInfo pd = libBI ++ execBI ++ testBI ++ benchBI
|
|||||||
|
|
||||||
-- | Extracting package names of dependency.
|
-- | Extracting package names of dependency.
|
||||||
cabalDependPackages :: [BuildInfo] -> [PackageBaseName]
|
cabalDependPackages :: [BuildInfo] -> [PackageBaseName]
|
||||||
cabalDependPackages bis = uniqueAndSort $ pkgs
|
cabalDependPackages bis = uniqueAndSort pkgs
|
||||||
where
|
where
|
||||||
pkgs = map getDependencyPackageName $ concatMap P.targetBuildDepends bis
|
pkgs = map getDependencyPackageName $ concatMap P.targetBuildDepends bis
|
||||||
getDependencyPackageName (Dependency (PackageName nm) _) = nm
|
getDependencyPackageName (Dependency (PackageName nm) _) = nm
|
||||||
@ -174,7 +174,7 @@ getGHC = do
|
|||||||
mv <- programFindVersion ghcProgram silent (programName ghcProgram)
|
mv <- programFindVersion ghcProgram silent (programName ghcProgram)
|
||||||
case mv of
|
case mv of
|
||||||
Nothing -> throwIO $ userError "ghc not found"
|
Nothing -> throwIO $ userError "ghc not found"
|
||||||
Just v -> return $ v
|
Just v -> return v
|
||||||
|
|
||||||
----------------------------------------------------------------
|
----------------------------------------------------------------
|
||||||
|
|
||||||
@ -190,7 +190,7 @@ cabalAllTargets pd = do
|
|||||||
Nothing -> []
|
Nothing -> []
|
||||||
Just l -> P.libModules l
|
Just l -> P.libModules l
|
||||||
|
|
||||||
libTargets = map toModuleString $ lib
|
libTargets = map toModuleString lib
|
||||||
#if __GLASGOW_HASKELL__ >= 704
|
#if __GLASGOW_HASKELL__ >= 704
|
||||||
benchTargets = map toModuleString $ concatMap P.benchmarkModules $ P.benchmarks pd
|
benchTargets = map toModuleString $ concatMap P.benchmarkModules $ P.benchmarks pd
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user