From 6450123e55be665423b952168fe09b1056887bb1 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 29 Aug 2012 11:03:20 -0700 Subject: [PATCH 1/2] Ignore some more undesirable files --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index d4ced7a1ac4..750f2289229 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,13 @@ Cabal/dist/ cabal-install/dist/ .hpc/ +# editor temp files + +*# +.#* +*~ +.*.swp + # GHC build Cabal/GNUmakefile From 8036af8c286074e05392247fef0c7d48e8da1ef4 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 29 Aug 2012 11:05:16 -0700 Subject: [PATCH 2/2] Do not pass -XHaskell98 to older compilers (fixes #1016) --- Cabal/Distribution/Simple/Program/GHC.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Cabal/Distribution/Simple/Program/GHC.hs b/Cabal/Distribution/Simple/Program/GHC.hs index c0c6868ad82..340c04eea1e 100644 --- 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