diff options
| author | Alp Mestanogullari <alp@well-typed.com> | 2018-05-12 08:36:19 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2018-05-12 09:10:26 +0100 |
| commit | 37810347dfeda977e7036cf8bc87ba079f094baa (patch) | |
| tree | 62d5e8ef0befc1ba699134b0327d6db5630cf39b /compiler/main/SysTools.hs | |
| parent | cb5c2fe875965b7aedbc189012803fc62e48fb3f (diff) | |
| download | haskell-37810347dfeda977e7036cf8bc87ba079f094baa.tar.gz | |
Expand $tooldir in ghc --info output
Summary:
This requires adding an `sToolDir :: Maybe FilePath` field to Settings, since
compilerInfo is pure and therefore needs to have all the information
available in the DynFlags.
This should fix #15101 and #15107.
Test Plan: ./validate --fast
Reviewers: Phyx, bgamari
Reviewed By: Phyx
Subscribers: rwbarton, thomie, carter
GHC Trac Issues: #15101, #15107
Differential Revision: https://phabricator.haskell.org/D4686
Diffstat (limited to 'compiler/main/SysTools.hs')
| -rw-r--r-- | compiler/main/SysTools.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index baf70df8a9..619e0b65e7 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -277,6 +277,7 @@ initSysTools mbMinusB sTmpDir = normalise tmpdir, sGhcUsagePath = ghc_usage_msg_path, sGhciUsagePath = ghci_usage_msg_path, + sToolDir = mtool_dir, sTopDir = top_dir, sRawSettings = mySettings, sExtraGccViaCFlags = words myExtraGccViaCFlags, |