Commit 599243e7 authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari
Browse files

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
parent 69cd1e9b
...@@ -196,6 +196,7 @@ import {-# SOURCE #-} ErrUtils ( Severity(..), MsgDoc, mkLocMessageAnn ...@@ -196,6 +196,7 @@ import {-# SOURCE #-} ErrUtils ( Severity(..), MsgDoc, mkLocMessageAnn
, getCaretDiagnostic, dumpSDoc ) , getCaretDiagnostic, dumpSDoc )
import Json import Json
import SysTools.Terminal ( stderrSupportsAnsiColors ) import SysTools.Terminal ( stderrSupportsAnsiColors )
import SysTools.BaseDir ( expandTopDir )
import System.IO.Unsafe ( unsafePerformIO ) import System.IO.Unsafe ( unsafePerformIO )
import Data.IORef import Data.IORef
...@@ -5115,7 +5116,7 @@ compilerInfo dflags ...@@ -5115,7 +5116,7 @@ compilerInfo dflags
-- Next come the settings, so anything else can be overridden -- Next come the settings, so anything else can be overridden
-- in the settings file (as "lookup" uses the first match for the -- in the settings file (as "lookup" uses the first match for the
-- key) -- key)
: rawSettings dflags : map (fmap $ expandTopDir $ topDir dflags) (rawSettings dflags)
++ [("Project version", projectVersion dflags), ++ [("Project version", projectVersion dflags),
("Project Git commit id", cProjectGitCommitId), ("Project Git commit id", cProjectGitCommitId),
("Booter version", cBooterVersion), ("Booter version", cBooterVersion),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment