From: simonmar <unknown>
Date: Fri, 8 Jul 2005 13:57:50 +0000 (+0000)
Subject: [project @ 2005-07-08 13:57:50 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~396
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d200e947960bd59db9713789e992eb1d7596d408;p=ghc-hetmet.git

[project @ 2005-07-08 13:57:50 by simonmar]
genOutputFilenameFunc: fix output filename generated for non-Haskell
compilations with -odir.
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index ec70b8d..882b45c 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -511,7 +511,7 @@ getOutputFilename dflags stop_phase output basename
 
 		odir_persistent
 		   | Just loc <- maybe_location = ml_obj_file loc
-		   | Just d <- odir = replaceFilenameDirectory persistent d
+		   | Just d <- odir = d `joinFileName` persistent
 		   | otherwise      = persistent