diff options
| author | Simon Marlow <smarlow@fb.com> | 2015-12-17 03:03:29 -0800 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2015-12-17 11:48:04 +0000 |
| commit | 27f47cda4a2d91bbeaeeb5efa8d0e3a908798120 (patch) | |
| tree | cb100f7c8ac085fcd96d38793b86df42f5bb4289 /ghc.mk | |
| parent | 62e60bb914980dff1b29eecbe1270deb0b265d9d (diff) | |
| download | haskell-27f47cda4a2d91bbeaeeb5efa8d0e3a908798120.tar.gz | |
Fix libffi dependency, and remove redundant LibFFI.hsc
LibFFI.hsc was moved to libraries/ghci/GHCi/FFI.hsc, I just forgot to
remove the old one. We also need an explicit dependency on libffi,
which moves from compiler/ghc.mk to the top-level ghc.mk (because
libraries/ghci/ghc.mk is auto-generated).
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -727,6 +727,12 @@ include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) .PHONY: stage1_libs stage1_libs : $(ALL_STAGE1_LIBS) +# We need this extra dependency when building our own libffi, because +# GHCi.FFI.hs #includes ffi.h +ifneq "$(UseSystemLibFFI)" "YES" +libraries/ghci/dist-install/build/GHCi/FFI.hs : $(libffi_HEADERS) +endif + # ---------------------------------------------- # Per-package compiler flags # |