diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-07-12 15:38:37 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-07-12 15:38:37 +0100 |
| commit | 73b98445b3ad268cdd09037d497d986bfc323825 (patch) | |
| tree | 5409c88f41501f5b87b0e72e7c5b4edb40e7cce0 /ghc.mk | |
| parent | aed43f7a1ed96277e9c14c6ef643eb134d5bf7f6 (diff) | |
| download | haskell-73b98445b3ad268cdd09037d497d986bfc323825.tar.gz | |
make sure libraries/dph/ghc.mk is included after the other DPH ghc.mk
files, so that it can refer to variables defined there. (necessary,
but perhaps not sufficient, to fix the DPH build bugs)
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -616,7 +616,10 @@ endif # ---------------------------------------------- # Actually include all the sub-ghc.mk's -include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) +# BUILD_DIRS_EXTRA needs to come after BUILD_DIRS, because stuff in +# libraries/dph/ghc.mk refers to stuff defined earlier, in particular +# things like $(libraries/dph/dph-base_dist-install_GHCI_LIB) +include $(patsubst %, %/ghc.mk, $(BUILD_DIRS) $(BUILD_DIRS_EXTRA)) # A useful pseudo-target (must be after the include above, because it needs # the value of things like $(libraries/base_dist-install_v_LIB). |