diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-04-06 14:30:59 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-04-06 14:30:59 +0100 |
| commit | 6caa417ded740fb8eaa50669269e38c8129092f0 (patch) | |
| tree | fa076eb916d9a7423a63a3c9062b28bc92177c19 /ghc | |
| parent | 91bb651a14f8fe4163394f26af50fb8f76fa0607 (diff) | |
| parent | 9e27ad106ef7036f356475daa0412ad72b56067b (diff) | |
| download | haskell-6caa417ded740fb8eaa50669269e38c8129092f0.tar.gz | |
Merge branch 'trac_5025' of https://github.com/thoughtpolice/ghc
* 'trac_5025' of https://github.com/thoughtpolice/ghc:
Teach GHC to compile objective-c files; trac #5025
Conflicts:
compiler/main/DriverPipeline.hs
Diffstat (limited to 'ghc')
| -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 da2a1f2329..9c993345bb 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -591,7 +591,7 @@ doMake srcs = do haskellish (f,Nothing) = looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f haskellish (_,Just phase) = - phase `notElem` [As, Cc, CmmCpp, Cmm, StopLn] + phase `notElem` [As, Cc, Cobjc, CmmCpp, Cmm, StopLn] hsc_env <- GHC.getSession |