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 /compiler/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 'compiler/ghc.mk')
-rw-r--r-- | compiler/ghc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 95cd45bd4e..a78255fecb 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -497,7 +497,7 @@ compiler/hsSyn/HsLit_HC_OPTS += -fomit-interface-pragmas endif # LibFFI.hs #includes ffi.h -compiler/stage2/build/LibFFI.hs : $(ffi_HEADER) +compiler/stage2/build/LibFFI.hs : $(libffi_HEADERS) # On Windows it seems we also need to link directly to libffi ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" define windowsDynLinkToFfi |