[commit: ghc] master: On OS X, fix the path to the libffi dynlib; fixes #7833 (9ffe792)

Ian Lynagh igloo at earth.li
Sat Jun 22 23:34:38 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/9ffe7920db654eed38f8c0e7dbfbab7e92fa9396

>---------------------------------------------------------------

commit 9ffe7920db654eed38f8c0e7dbfbab7e92fa9396
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Jun 22 16:16:49 2013 +0100

    On OS X, fix the path to the libffi dynlib; fixes #7833

>---------------------------------------------------------------

 rules/build-prog.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index cfaadaa..17d64da 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -270,6 +270,7 @@ endif
 # Use relative paths for the RTS. Rather than try to work out which RTS
 # way is being linked, we just change it for all ways
 	install_name_tool $$(foreach w,$$(rts_WAYS), -change $$(TOP)/$$(rts_$$w_LIB) @loader_path/../rts-$$(rts_VERSION)/$$(rts_$$w_LIB_NAME)) $$@
+	install_name_tool -change $$(TOP)/$$(wildcard libffi/build/inst/lib/libffi.*.dylib) @loader_path/../rts-$$(rts_VERSION)/libffi.dylib $$@
 endif
 endif
 endif





More information about the ghc-commits mailing list