diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-09-16 11:49:24 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-09-16 11:49:25 -0400 |
| commit | ea310f9956179f91ca973bc747b0bc7b061bc174 (patch) | |
| tree | 0f32a6b60091c6a53f9303cbce166ef81493e58a /compiler/main | |
| parent | 97b47d277d6b0ced3ce73175f78b23ecff84cfa3 (diff) | |
| download | haskell-ea310f9956179f91ca973bc747b0bc7b061bc174.tar.gz | |
Remove directories from include paths
Previously this was a relative path which worked in the GHC tree, but
failed elsewhere. This caused trouble for out-of-tree users as well as
Hadrian, which wants to move build artifacts out of the working
directory. Fixes #8040.
Test Plan: Validate
Reviewers: thomie, austin, snowleopard, hvr
Reviewed By: snowleopard, hvr
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2530
GHC Trac Issues: #8040
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 3 | ||||
| -rw-r--r-- | compiler/main/PlatformConstants.hs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 7546936e4f..b642bead7b 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -4765,7 +4765,8 @@ compilerInfo dflags showBool False = "NO" isWindows = platformOS (targetPlatform dflags) == OSMinGW32 -#include "../includes/dist-derivedconstants/header/GHCConstantsHaskellWrappers.hs" +-- Produced by deriveConstants +#include "GHCConstantsHaskellWrappers.hs" bLOCK_SIZE_W :: DynFlags -> Int bLOCK_SIZE_W dflags = bLOCK_SIZE dflags `quot` wORD_SIZE dflags diff --git a/compiler/main/PlatformConstants.hs b/compiler/main/PlatformConstants.hs index b2ca32be68..c9a4072206 100644 --- a/compiler/main/PlatformConstants.hs +++ b/compiler/main/PlatformConstants.hs @@ -10,5 +10,6 @@ module PlatformConstants (PlatformConstants(..)) where -#include "../includes/dist-derivedconstants/header/GHCConstantsHaskellType.hs" +-- Produced by deriveConstants +#include "GHCConstantsHaskellType.hs" |