Permalink
Browse files

Merge branch 'cabal-1.16'

  • Loading branch information...
2 parents 47f280e + 8036af8 commit 216d6c790d7165b84a8d20a489f000e3bb3ebe4f @bos bos committed Aug 29, 2012
Showing with 10 additions and 1 deletion.
  1. +7 −0 .gitignore
  2. +3 −1 Cabal/Distribution/Simple/Program/GHC.hs
View
@@ -10,6 +10,13 @@ cabal-install/dist/
*.prof
*.tix
+# editor temp files
+
+*#
+.#*
+*~
+.*.swp
+
# GHC build
Cabal/GNUmakefile
@@ -300,7 +300,9 @@ renderGhcOptions version@(Version ver _) opts =
----------------------------
-- Language and extensions
- , [ "-X" ++ display lang | lang <- flag ghcOptLanguage ]
+ , if ver >= [7]
+ then [ "-X" ++ display lang | lang <- flag ghcOptLanguage ]
+ else []
, [ case lookup ext (ghcOptExtensionMap opts) of
Just arg -> arg

0 comments on commit 216d6c7

Please sign in to comment.