From 3e18f8be62b06c846b52d79717f79d51e2060593 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 4 Dec 2009 14:36:14 +0000 Subject: Link all dynamic libraries with the correct install_name on Mac OS/X. This is a rerecord of Stephen Blackheath **20090930222855 to avoid conflicts. --- libffi/ghc.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libffi/ghc.mk') diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 7104d046b9..92e11dddfa 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -84,10 +84,14 @@ libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB) else libffi_DYNAMIC_PROG = +ifeq "$(darwin_TARGET_OS)" "1" +libffi_DYNAMIC_LIBS = libffi/libffi$(soext) libffi/libffi.5$(soext) libffi/libffi.5.0.9$(soext) +else libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \ libffi/dist-install/build/libffi.so.5 \ libffi/dist-install/build/libffi.so.5.0.9 endif +endif ifeq "$(BuildSharedLibs)" "YES" libffi_EnableShared=yes @@ -200,6 +204,10 @@ $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD) # Rename libffi.so to libHSffi...so $(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/. "$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB) +ifeq "$(darwin_TARGET_OS)" "1" + # Ensure library's install name is correct before anyone links with it. + install_name_tool -id $(ghclibdir)/$(libffi_HS_DYN_LIB_NAME) $(libffi_HS_DYN_LIB) +endif $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB))) endif -- cgit v1.2.1