From: simonmar Date: Fri, 8 Feb 2002 15:00:40 +0000 (+0000) Subject: [project @ 2002-02-08 15:00:40 by simonmar] X-Git-Tag: Approximately_9120_patches~116 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e853681924c4cf1e1f2dd75276973aedd222d358;p=ghc-hetmet.git [project @ 2002-02-08 15:00:40 by simonmar] Avoid using findPS/packString where simple string matching will do. --- diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 0da82e1..f48f9e0 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -58,7 +58,6 @@ import Monad import Maybe import PackedString -import MatchPS ----------------------------------------------------------------------------- -- genPipeline @@ -981,9 +980,9 @@ doMkDLL o_files = do ++ pkg_lib_path_opts ++ pkg_lib_opts ++ pkg_extra_ld_opts - ++ (case findPS (packString (concat extra_ld_opts)) (packString "--def") of - Nothing -> [ "--export-all" ] - Just _ -> [ "" ]) + ++ (if "--def" `elem` (concatMap words extra_ld_opts) + then [ "" ] + else [ "--export-all" ]) ++ extra_ld_opts ))