Add configure phases for the stage 3 compiler

[ghc-hetmet.git] / utils / ghc-cabal / Main.hs

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 81b47db..9cb9928 100644 (file)
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -46,6 +46,8 @@ main = do args <- getArgs
                    _ -> die syntax_error
               "sdist" : dir : distDir : [] ->
                   doSdist dir distDir
+              ["--version"] ->
+                  defaultMainArgs ["--version"]
               _ -> die syntax_error
 
 syntax_error :: [String]
@@ -363,6 +365,7 @@ generate config_args distdir directory
                 variablePrefix ++ "_HC_OPTS = " ++ escape (unwords
                        (   programDefaultArgs ghcProg
                         ++ hcOptions GHC bi
+                        ++ languageToFlags (compiler lbi) (defaultLanguage bi)
                         ++ extensionsToFlags (compiler lbi) (usedExtensions bi)
                         ++ programOverrideArgs ghcProg)),
                 variablePrefix ++ "_CC_OPTS = " ++ unwords (ccOptions bi),