diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-07-30 22:11:41 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-07-30 22:11:41 +0100 |
| commit | a10e1990edc8104640738e5209e7a70f464fca38 (patch) | |
| tree | f7e9806b4181a1d18b0ab6689b8ca9af9c2afd9f | |
| parent | e9775242293b797faf0719b72588112b2044d322 (diff) | |
| download | haskell-a10e1990edc8104640738e5209e7a70f464fca38.tar.gz | |
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.
| -rw-r--r-- | ghc/Main.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index 5af51bba46..66db90a9f7 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] |