[commit: ghc] master: Change which files --make mode thinks are 'Haskellish' (a10e199)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a10e1990edc8104640738e5209e7a70f464fca38

>---------------------------------------------------------------

commit a10e1990edc8104640738e5209e7a70f464fca38
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Jul 30 22:11:41 2013 +0100

    Change which files --make mode thinks are 'Haskellish'
    
    It thought that .cmm files were Haskellish, but then didn't know
    how to compile them. Now they aren't treated as Haskellish, and
    it can compile and link them.

>---------------------------------------------------------------

 ghc/Main.hs |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ghc/Main.hs b/ghc/Main.hs
index 5af51bb..66db90a 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -33,8 +33,7 @@ import Config
 import Constants
 import HscTypes
 import Packages         ( dumpPackages )
-import DriverPhases     ( Phase(..), isSourceFilename, anyHsc,
-                          startPhase, isHaskellSrcFilename )
+import DriverPhases
 import BasicTypes       ( failed )
 import StaticFlags
 import DynFlags
@@ -626,7 +625,7 @@ doMake srcs  = do
     let (hs_srcs, non_hs_srcs) = partition haskellish srcs
 
         haskellish (f,Nothing) =
-          looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f
+          looksLikeModuleName f || isHaskellUserSrcFilename f || '.' `notElem` f
         haskellish (_,Just phase) =
           phase `notElem` [As, Cc, Cobjc, Cobjcpp, CmmCpp, Cmm, StopLn]