diff options
| author | Phil Ruffwind <rf@rufflewind.com> | 2016-12-17 18:07:49 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-12-17 18:09:38 -0500 |
| commit | 3dbd2b097aeb9217f4a7fc87e610e6983ebbce7b (patch) | |
| tree | 90662d564d4c71b2b320d804e3b11353075bf8bd /compiler/ghc.mk | |
| parent | 8906e7b79a585039712034d9e88ca49f3cea6554 (diff) | |
| download | haskell-3dbd2b097aeb9217f4a7fc87e610e6983ebbce7b.tar.gz | |
Windows: Improve terminal detection mechanism
The previous detection mechanism allowed environment variables (ANSICON,
ConEmuANSI, TERM) to supersede the fact that the stderr is not a
terminal, which is probably what led to color codes appearing in the
stderr of the tests (see: 847d229346431483b99adcff12e46c7bf6af15da).
This commit changes the detection mechanism to detect Cygwin/MSYS2
terminals in a more reliable manner, avoiding the use of environment
variables entirely.
Test Plan: validate
Reviewers: Phyx, austin, erikd, bgamari
Reviewed By: Phyx, bgamari
Subscribers: RyanGlScott, thomie
Differential Revision: https://phabricator.haskell.org/D2809
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 2b85e42b68..37a026c722 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -532,6 +532,7 @@ compiler_stage2_dll0_MODULES = \ SrcLoc \ StaticFlags \ StringBuffer \ + SysTools.Terminal \ TcEvidence \ TcRnTypes \ TcType \ |