diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-09 15:52:30 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-09 15:52:30 +0100 |
| commit | ba00c33b8b2116a8f3ee13d28e5b5085ff265d58 (patch) | |
| tree | ab955e759ef1efec3b3c7f10e296927d35308c02 /libffi | |
| parent | a5a52d794ac38df35187780f4671e2ae317e93a0 (diff) | |
| download | haskell-ba00c33b8b2116a8f3ee13d28e5b5085ff265d58.tar.gz | |
Fix the name of libffi
On Windows, we need to keep the DLL called libffi-6.dll (rather than
libffi.dll) or Windows can't find it.
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 07d6d3d74c..3cccee9c6a 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -35,8 +35,12 @@ libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a libffi_HEADERS = rts/dist/build/ffi.h \ rts/dist/build/ffitarget.h -LIBFFI_WINDOWS_LIB = ffi-6 -LIBFFI_DLL = lib$(LIBFFI_WINDOWS_LIB).dll +ifeq "$(HostOS_CPP)" "mingw32" +LIBFFI_NAME = ffi-6 +else +LIBFFI_NAME = ffi +endif +LIBFFI_DLL = lib$(LIBFFI_NAME).dll ifeq "$(OSTYPE)" "cygwin" LIBFFI_PATH_MANGLE = PATH=$$(cygpath "$(TOP)")/libffi:$$PATH; export PATH; |