From caf2112355b82016e3644a31b52249129b48a3ab Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 16 Jul 2009 00:53:14 +0000 Subject: [PATCH] Move showOpt into DynFlags --- compiler/main/DynFlags.hs | 6 +++++- compiler/main/SysTools.lhs | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 1aaa728..fce8eac 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -17,7 +17,7 @@ module DynFlags ( GhcMode(..), isOneShot, GhcLink(..), isNoLink, PackageFlag(..), - Option(..), + Option(..), showOpt, DynLibLoader(..), fFlags, xFlags, dphPackage, @@ -854,6 +854,10 @@ data Option String -- the filepath/filename portion | Option String +showOpt :: Option -> String +showOpt (FileOption pre f) = pre ++ f +showOpt (Option s) = s + ----------------------------------------------------------------------------- -- Setting the optimisation level diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index bb706df..7a37b4c 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -711,10 +711,6 @@ data BuildMessage | BuildError !SrcLoc !SDoc | EOF -showOpt :: Option -> String -showOpt (FileOption pre f) = pre ++ f -showOpt (Option s) = s - traceCmd :: DynFlags -> String -> String -> IO () -> IO () -- a) trace the command (at two levels of verbosity) -- b) don't do it at all if dry-run is set -- 1.7.10.4