diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-14 13:45:35 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-14 13:45:35 +0100 |
| commit | 08200cc71ac9a0408118519a0bf0edacd43af61c (patch) | |
| tree | d87d8a59bda240448a7edf0bf9072de838811fd2 /libffi | |
| parent | b7a2c9e17b92336083cbff266ef22a07cdb49ee9 (diff) | |
| download | haskell-08200cc71ac9a0408118519a0bf0edacd43af61c.tar.gz | |
Fix ffi build on amd64/Linux, and simplify a little more
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index f6e99c2e58..22ce6389bc 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -11,25 +11,13 @@ # ----------------------------------------------------------------------------- -ifeq "$(BuildSharedLibs)" "YES" -libffi_STAMP_CONFIGURE = libffi/stamp.ffi.configure-shared -libffi_STAMP_BUILD = libffi/stamp.ffi.build-shared -libffi_STAMP_INSTALL = libffi/stamp.ffi.install-shared -else libffi_STAMP_CONFIGURE = libffi/stamp.ffi.configure libffi_STAMP_BUILD = libffi/stamp.ffi.build libffi_STAMP_INSTALL = libffi/stamp.ffi.install -endif libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a ffi_HEADER = rts/dist/build/ffi.h -ifeq "$(BuildSharedLibs)" "YES" -libffi_EnableShared=yes -else -libffi_EnableShared=no -endif - ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): "$(RM)" $(RM_OPTS_REC) $(LIBFFI_DIR) libffi/build @@ -55,8 +43,9 @@ $(libffi_STAMP_CONFIGURE): LDFLAGS="$(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE1) -w" \ "$(SHELL)" configure \ --prefix=$(TOP)/libffi/build/inst \ + --with-pic \ --enable-static=yes \ - --enable-shared=$(libffi_EnableShared) \ + --enable-shared=no \ --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM) # wc on OS X has spaces in its output, which libffi's Makefile |