From: simonmar Date: Mon, 18 Dec 2000 15:17:46 +0000 (+0000) Subject: [project @ 2000-12-18 15:17:46 by simonmar] X-Git-Tag: Approximately_9120_patches~3074 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fb931d955c85ebf16f7d984210cd5a4b0dbeb929;p=ghc-hetmet.git [project @ 2000-12-18 15:17:46 by simonmar] fix for -S w/ -split-objs --- diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 1733d63..74d0b0a 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.42 2000/12/18 12:43:04 sewardj Exp $ +-- $Id: DriverPipeline.hs,v 1.43 2000/12/18 15:17:46 simonmar Exp $ -- -- GHC Driver -- @@ -230,9 +230,11 @@ genPipeline todo stop_flag persistent_output lang filename -- the suffix on an output file is determined by the next phase -- in the pipeline, so we add linking to the end of the pipeline -- to force the output from the final phase to be a .o file. - stop_phase = case todo of StopBefore phase -> phase - DoMkDependHS -> Ln - DoLink -> Ln + stop_phase = case todo of + StopBefore As | split -> SplitAs + StopBefore phase -> phase + DoMkDependHS -> Ln + DoLink -> Ln annotated_pipeline = annotatePipeline (pipeline ++ [ Ln ]) stop_phase phase_ne p (p1,_,_) = (p1 /= p)