Fix build failures 2

This commit is contained in:
Andrew Gibiansky 2015-08-25 12:36:20 -07:00
parent 71265f2d2e
commit 779ecf9e1d
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
*.hi
main/Main
.stack-work
notebooks/Test.ipynb
notebooks/Untitled.ipynb

View File

@ -117,7 +117,7 @@ runKernel kernelOpts profileSrc = do
(exitCode, stackStdout, _) <- readProcessWithExitCode "stack" [] ""
let stack = exitCode == ExitSuccess && "The Haskell Tool Stack" `isInfixOf` stackStdout
#if MIN_VERSION_base(4,7,0)
#if MIN_VERSION_ghc(7,8,0)
-- If we're in a stack directory, use `stack` to set the environment
-- We can't do this with base <= 4.6 because setEnv doesn't exist.
when stack $ do