diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-03 15:03:02 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-03 15:03:02 +0000 |
| commit | 979c11345ee532a4fc56aab54f51d2924c0ea841 (patch) | |
| tree | 7c513f77556a8c4cbef0f6c63fd45cf86025f8bb /libffi | |
| parent | 8ecf9d56f819de8b46d6103a6ebb42e48ccb4c8f (diff) | |
| download | haskell-979c11345ee532a4fc56aab54f51d2924c0ea841.tar.gz | |
Fix dynamic libs on OS X, and enable them by default
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 440b1ef893..3e00db2f5f 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -86,7 +86,7 @@ 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) +libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) libffi/dist-install/build/libffi.5$(soext) libffi/dist-install/build/libffi.5.0.9$(soext) else libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \ libffi/dist-install/build/libffi.so.5 @@ -207,8 +207,8 @@ $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD) $(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) + # 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))) |