diff options
| author | Yuriy Syrovetskiy <cblp@cblp.su> | 2019-04-02 12:59:49 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-08 14:41:51 -0400 |
| commit | 97502be8bda9199ac058b9677b4b6ba028022936 (patch) | |
| tree | 36ed855bd07d08f4127c45265d5e4f27ea8dbcac /compiler/main/DriverPipeline.hs | |
| parent | 2b3f4718502465e2b4dfa4a7868ed7a3ad5e4ff1 (diff) | |
| download | haskell-97502be8bda9199ac058b9677b4b6ba028022936.tar.gz | |
Add `-optcxx` option (#16477)
Diffstat (limited to 'compiler/main/DriverPipeline.hs')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 458a118912..83e6bfde59 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1218,17 +1218,8 @@ runPhase (RealPhase cc_phase) input_fn dflags ghcVersionH <- liftIO $ getGhcVersionPathName dflags - let gcc_lang_opt | cc_phase `eqPhase` Ccxx = "c++" - | cc_phase `eqPhase` Cobjc = "objective-c" - | cc_phase `eqPhase` Cobjcxx = "objective-c++" - | otherwise = "c" - liftIO $ SysTools.runCc dflags ( - -- force the C compiler to interpret this file as C when - -- compiling .hc files, by adding the -x c option. - -- Also useful for plain .c files, just in case GHC saw a - -- -x c option. - [ SysTools.Option "-x", SysTools.Option gcc_lang_opt - , SysTools.FileOption "" input_fn + liftIO $ SysTools.runCc (phaseForeignLanguage cc_phase) dflags ( + [ SysTools.FileOption "" input_fn , SysTools.Option "-o" , SysTools.FileOption "" output_fn ] @@ -1917,7 +1908,7 @@ doCpp dflags raw input_fn output_fn = do let verbFlags = getVerbFlags dflags let cpp_prog args | raw = SysTools.runCpp dflags args - | otherwise = SysTools.runCc dflags (SysTools.Option "-E" : args) + | otherwise = SysTools.runCc Nothing dflags (SysTools.Option "-E" : args) let target_defs = [ "-D" ++ HOST_OS ++ "_BUILD_OS", |