diff options
| author | Clemens Fruhwirth <clemens@endorphin.org> | 2008-10-10 07:31:06 +0000 |
|---|---|---|
| committer | Clemens Fruhwirth <clemens@endorphin.org> | 2008-10-10 07:31:06 +0000 |
| commit | 739d8a5b677609d4c4477667b7ced7f352aaac87 (patch) | |
| tree | faa0e87630b3ebdcb02d53d555b95114354d69cc /libffi | |
| parent | cb7f210f937bafb0f552259c23a28a037ddea4ce (diff) | |
| download | haskell-739d8a5b677609d4c4477667b7ced7f352aaac87.tar.gz | |
Delay building libffi until package.conf is created and fix bindist
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libffi/Makefile b/libffi/Makefile index 989325229f..38720cc25d 100644 --- a/libffi/Makefile +++ b/libffi/Makefile @@ -57,7 +57,7 @@ LIBFFI_DIR := $(subst .tar.gz,,$(LIBFFI_TARBALL)) BINDIST_STAMPS = stamp.ffi INSTALL_HEADERS += ffi.h STATIC_LIB = libffi.a -INSTALL_LIBS += $(STATIC_LIB) +INSTALL_LIBS += libHSffi.a # We have to add the GHC version to the name of our dynamic libs, because # they will be residing in the system location along with dynamic libs from @@ -80,8 +80,10 @@ EnableShared=no endif ifeq "$(BuildSharedLibs)" "YES" -INSTALL_LIBS += $(DYNAMIC_LIBS) -INSTALL_PROGS += $(DYNAMIC_PROGS) +INSTALL_LIBS += $(HS_DYN_LIB_NAME) +ifeq "$(Windows)" "YES" +INSTALL_PROGS += $(HS_DYN_LIB_NAME).a +endif endif install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS) |