Added conditional compilation so that yesod-bin/Devel.hs can pass travis-ci tests.
Signed-off-by: Njagi Mwaniki <mwanikibusiness@gmail.com>
This commit is contained in:
parent
c3a05d1f7b
commit
58a07b0ea3
@ -507,7 +507,11 @@ lookupLdAr = do
|
|||||||
|
|
||||||
lookupLdAr' :: IO (Maybe (FilePath, FilePath))
|
lookupLdAr' :: IO (Maybe (FilePath, FilePath))
|
||||||
lookupLdAr' = do
|
lookupLdAr' = do
|
||||||
|
#if MIN_VERSION_Cabal(1,22,0)
|
||||||
(_, _, pgmc) <- D.configCompilerEx (Just D.GHC) Nothing Nothing D.defaultProgramConfiguration D.silent
|
(_, _, pgmc) <- D.configCompilerEx (Just D.GHC) Nothing Nothing D.defaultProgramConfiguration D.silent
|
||||||
|
#else
|
||||||
|
(_, pgmc) <- D.configCompiler (Just D.GHC) Nothing Nothing D.defaultProgramConfiguration D.silent
|
||||||
|
#endif
|
||||||
pgmc' <- D.configureAllKnownPrograms D.silent pgmc
|
pgmc' <- D.configureAllKnownPrograms D.silent pgmc
|
||||||
return $ (,) <$> look D.ldProgram pgmc' <*> look D.arProgram pgmc'
|
return $ (,) <$> look D.ldProgram pgmc' <*> look D.arProgram pgmc'
|
||||||
where
|
where
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user