Don't use "--with-ghcjs" with old cabal

Fix to the fix for #1052
commercialhaskell · Oct 7, 2015 · c11ad03 · c11ad03
1 parent 3906811
commit c11ad03
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -598,7 +598,9 @@ ensureConfig newConfigCache pkgDir ExecuteEnv {..} announce cabal cabalfp = do
         deleteCaches pkgDir
         announce
         menv <- getMinimalEnvOverride
-        exes <- forM (words "ghc ghcjs") $ \name -> do
+        let programNames =
+                if eeCabalPkgVer < $(mkVersion "1.22") then ["ghc"] else ["ghc", "ghcjs"]
+        exes <- forM programNames $ \name -> do
             mpath <- findExecutable menv name
             return $ case mpath of
                 Nothing -> []