From 779ecf9e1d831c8b5fcb2d7d079a5ffb45563c89 Mon Sep 17 00:00:00 2001 From: Andrew Gibiansky Date: Tue, 25 Aug 2015 12:36:20 -0700 Subject: [PATCH] Fix build failures 2 --- .gitignore | 1 + main/Main.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ab45345d..7e0d4f92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.hi +main/Main .stack-work notebooks/Test.ipynb notebooks/Untitled.ipynb diff --git a/main/Main.hs b/main/Main.hs index baf8aef3..3a7106ab 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -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