[commit: ghc] master: DynFlags: Expand $topdir in --info output (599243e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/599243e73384e1b74a07f175b2d7324778a0f79c/ghc

>---------------------------------------------------------------

commit 599243e73384e1b74a07f175b2d7324778a0f79c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 23 13:05:30 2017 -0500

    DynFlags: Expand $topdir in --info output
    
    Test Plan: Try running nofib on Windows
    
    Reviewers: Phyx
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4222


>---------------------------------------------------------------

599243e73384e1b74a07f175b2d7324778a0f79c
 compiler/main/DynFlags.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index d790f44..74c0a22 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -196,6 +196,7 @@ import {-# SOURCE #-} ErrUtils ( Severity(..), MsgDoc, mkLocMessageAnn
                                , getCaretDiagnostic, dumpSDoc )
 import Json
 import SysTools.Terminal ( stderrSupportsAnsiColors )
+import SysTools.BaseDir ( expandTopDir )
 
 import System.IO.Unsafe ( unsafePerformIO )
 import Data.IORef
@@ -5115,7 +5116,7 @@ compilerInfo dflags
       -- Next come the settings, so anything else can be overridden
       -- in the settings file (as "lookup" uses the first match for the
       -- key)
-    : rawSettings dflags
+    : map (fmap $ expandTopDir $ topDir dflags) (rawSettings dflags)
    ++ [("Project version",             projectVersion dflags),
        ("Project Git commit id",       cProjectGitCommitId),
        ("Booter version",              cBooterVersion),