diff options
| author | PHO <pho@cielonegro.org> | 2011-12-06 23:15:35 +0900 |
|---|---|---|
| committer | PHO <pho@cielonegro.org> | 2011-12-08 10:57:28 +0900 |
| commit | 616b669738e6ddaf0588957ad974b91944420983 (patch) | |
| tree | da71167eaa72a4649246e74a39908fc2a8b1140c /ghc.mk | |
| parent | 3640d374f3501c0addb1be273ecc0f10f93be10d (diff) | |
| download | haskell-616b669738e6ddaf0588957ad974b91944420983.tar.gz | |
Resurrect UseLibFFIForAdjustors from bitrot.
* Pass -Irts/dist/build to the C preprocessor to expose libffi headers (ffi.h and ffitarget.h) to foreign import wrappers during the building process of GHC itself.
* Install libffi headers into $(ghcheaderdir) just like any other C headers. Otherwise an installed GHC can't find them when it wants to compile foreign import wrappers.
* Include libffi headers in the bindist for the same reason.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -929,6 +929,7 @@ $(eval $(call bindist,.,\ $(includes_H_FILES) \ $(includes_DERIVEDCONSTANTS) \ $(includes_GHCCONSTANTS) \ + $(libffi_HEADERS) \ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_TOPDIRS) \ @@ -1207,9 +1208,10 @@ maintainer-clean : distclean .PHONY: all_libraries .PHONY: bootstrapping-files -bootstrapping-files: includes/ghcautoconf.h -bootstrapping-files: includes/DerivedConstants.h -bootstrapping-files: includes/GHCConstants.h +bootstrapping-files: $(includes_H_CONFIG) +bootstrapping-files: $(includes_DERIVEDCONSTANTS) +bootstrapping-files: $(includes_GHCCONSTANTS) +bootstrapping-files: $(libffi_HEADERS) .DELETE_ON_ERROR: |