Merge branch 'cabal-1.16'

gentoo-haskell · Aug 29, 2012 · 216d6c7 · 216d6c7
2 parents 47f280e + 8036af8
commit 216d6c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,13 @@ cabal-install/dist/
 *.prof
 *.tix
 
+# editor temp files
+
+*#
+.#*
+*~
+.*.swp
+
 # GHC build
 
 Cabal/GNUmakefile

diff --git a/Cabal/Distribution/Simple/Program/GHC.hs b/Cabal/Distribution/Simple/Program/GHC.hs
@@ -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