Commit 739d8a5b authored by Clemens Fruhwirth's avatar Clemens Fruhwirth

Delay building libffi until package.conf is created and fix bindist

parent cb7f210f
......@@ -104,7 +104,6 @@ stage1 : $(GCC_LIB_DEP) check-all
$(MAKE) -C gmp all
$(MAKE) -C utils/mkdependC boot
$(MAKE) -C utils with-bootstrapping-compiler
$(MAKE) -C libffi all
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS_BUILD); do \
echo "------------------------------------------------------------------------"; \
......@@ -122,6 +121,7 @@ stage1 : $(GCC_LIB_DEP) check-all
$(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
done
$(MAKE) -C libffi all
$(MAKE) -C rts boot
$(MAKE) -C rts
$(MAKE) -C libraries all
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment