X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverPipeline.hs;h=690328d8070021310feafa4cd573fae9b31c7d65;hb=c305b14a2481b4e367a5b70981a0b8b667a95e61;hp=c0f5e7b7842f2a86361eb1fc26e0657c1eb8c015;hpb=501281032723cfb1e6e324921c6c3e47b03730ab;p=ghc-hetmet.git

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index c0f5e7b..690328d 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -789,7 +789,7 @@ runPhase Cmm stop dflags basename suff input_fn get_output_fn maybe_loc
 -- way too many hacks, and I can't say I've ever used it anyway.
 
 runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc
-   | cc_phase `eqPhase` Cc || cc_phase `eqPhase` HCc
+   | cc_phase `eqPhase` Cc || cc_phase `eqPhase` Ccpp || cc_phase `eqPhase` HCc
    = do	let cc_opts = getOpts dflags opt_c
 	    hcc = cc_phase `eqPhase` HCc
 
@@ -851,7 +851,8 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc
 		-- 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 "c"] ++
+			[ SysTools.Option "-x", if cc_phase `eqPhase` Ccpp
+                                                then SysTools.Option "c++" else SysTools.Option "c"] ++
 			[ SysTools.FileOption "" input_fn
 			, SysTools.Option "-o"
 			, SysTools.FileOption "" output_fn