diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-04-01 19:22:28 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-04-01 19:22:54 +0200 |
| commit | 7cec6c7b2973b34c18da1c74c87cead33bb1bfd7 (patch) | |
| tree | be99face836f135e843f758ff9eab09b6f122f93 /ghc/Main.hs | |
| parent | d4cf7051bc17182238b17ba1dc42e190fa5c6f0d (diff) | |
| download | haskell-7cec6c7b2973b34c18da1c74c87cead33bb1bfd7.tar.gz | |
Change which files --make thinks are 'Haskellish' (#10220)
`.hspp` and `.hscpp` are haskell files that have already been preprocessed.
Treat `.hspp` and `.hscpp` as Haskellish sources again, as they were before
commit a10e1990. This way, ghc --make will load their imports.
Make sure that `.cmm` and `.cmmcpp` are still not treated as Haskellish,
by moving them out of `haskell_src_suffixes` (but still keeping them in
haskellish_suffixes, though I'm not sure what the purpose of that group
is).
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D778
Diffstat (limited to 'ghc/Main.hs')
| -rw-r--r-- | ghc/Main.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index 2f013aa76e..fa266a24f8 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -656,7 +656,7 @@ doMake srcs = do let (hs_srcs, non_hs_srcs) = partition haskellish srcs haskellish (f,Nothing) = - looksLikeModuleName f || isHaskellUserSrcFilename f || '.' `notElem` f + looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f haskellish (_,Just phase) = phase `notElem` [ As True, As False, Cc, Cobjc, Cobjcxx, CmmCpp, Cmm , StopLn] |