maybe fix build for lts-16.13
This commit is contained in:
parent
5e2355eadd
commit
c59e1df710
@ -491,8 +491,8 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
|
|||||||
#endif
|
#endif
|
||||||
-- If we're loading dynamic libs we need the cbits to appear before the
|
-- If we're loading dynamic libs we need the cbits to appear before the
|
||||||
-- real packages.
|
-- real packages.
|
||||||
settings <- initSysTools (Just libdir)
|
settings <- initSysTools (libdir)
|
||||||
llvmConfig <- initLlvmConfig (Just libdir)
|
llvmConfig <- initLlvmConfig (libdir)
|
||||||
dflags <- initDynFlags $ defaultDynFlags settings llvmConfig
|
dflags <- initDynFlags $ defaultDynFlags settings llvmConfig
|
||||||
libs <- mapM (findHSlib
|
libs <- mapM (findHSlib
|
||||||
#if MIN_VERSION_ghc(7,8,0)
|
#if MIN_VERSION_ghc(7,8,0)
|
||||||
|
@ -126,8 +126,8 @@ readBinIface' :: FilePath -> IO ModIface
|
|||||||
readBinIface' hi_path = do
|
readBinIface' hi_path = do
|
||||||
-- kludgy as hell
|
-- kludgy as hell
|
||||||
#if MIN_VERSION_ghc(7,2,0)
|
#if MIN_VERSION_ghc(7,2,0)
|
||||||
mySettings <- initSysTools (Just libdir) -- how should we really set the top dir?
|
mySettings <- initSysTools (libdir) -- how should we really set the top dir?
|
||||||
llvmConfig <- initLlvmConfig (Just libdir)
|
llvmConfig <- initLlvmConfig (libdir)
|
||||||
dflags <- initDynFlags (defaultDynFlags mySettings llvmConfig)
|
dflags <- initDynFlags (defaultDynFlags mySettings llvmConfig)
|
||||||
e <- newHscEnv dflags
|
e <- newHscEnv dflags
|
||||||
#else
|
#else
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
|
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
|
||||||
|
|
||||||
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
|
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
|
||||||
resolver: lts-14.27
|
resolver: lts-16.13
|
||||||
|
|
||||||
# Local packages, usually specified by relative directory name
|
# Local packages, usually specified by relative directory name
|
||||||
packages:
|
packages:
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
packages: []
|
packages: []
|
||||||
snapshots:
|
snapshots:
|
||||||
- completed:
|
- completed:
|
||||||
size: 524996
|
size: 532381
|
||||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml
|
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/13.yaml
|
||||||
sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0
|
sha256: 6ee17f7996e5bc75ae4406250841f1362ad4196418a4d90a0615ff4f26ac98df
|
||||||
original: lts-14.27
|
original: lts-16.13
|
||||||
|
Loading…
x
Reference in New Issue
Block a user