From 8d4bce42de7929b0dec7e7d68e66bcfc4d266322 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Thu, 11 May 2017 18:11:12 +0800 Subject: libffi via submodule This is rather annoying. I'd prefer to have a stable release to use. However libffi-3.2.1 has been released November 12, 2014, and libffi-4 is TBD. See also https://github.com/libffi/libffi/issues/296 The core reason for this change is that llvm changed the supported assembly to unified syntax, which libffi-3.2.1 does not use, and hence fails to compile for arm with llvm. For refence, see the following issue: https://github.com/libffi/libffi/issues/191 Reviewers: austin, bgamari Reviewed By: bgamari Subscribers: rwbarton, thomie, snowleopard Differential Revision: https://phabricator.haskell.org/D3349 --- libffi/build | 1 + libffi/ghc.mk | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 libffi/build (limited to 'libffi') diff --git a/libffi/build b/libffi/build new file mode 160000 index 0000000000..b841ae70a0 --- /dev/null +++ b/libffi/build @@ -0,0 +1 @@ +Subproject commit b841ae70a05a5e11de1fca1b4551189db0895cf2 diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 7c5bc9e1b3..08f5e4d40a 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -50,9 +50,8 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP) $(call removeFiles,$(libffi_STAMP_STATIC_SHARED_CONFIGURE)) $(call removeFiles,$(libffi_STAMP_STATIC_SHARED_BUILD)) $(call removeFiles,$(libffi_STAMP_STATIC_SHARED_INSTALL)) - $(call removeTrees,$(LIBFFI_DIR) libffi/build) - cat libffi-tarballs/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; } - mv libffi/libffi-* libffi/build + git clean -x -f -d libffi/build + cd libffi/build && ./autogen.sh # update config.guess/config.sub $(CP) "$(TOP)/config.guess" libffi/build/config.guess @@ -123,10 +122,10 @@ $(libffi_STATIC_LIB): $(libffi_STAMP_INSTALL) @test -f $@ || { echo "$< exists, but $@ does not."; echo "Suggest removing $<."; exit 1; } $(libffi_HEADERS): $(libffi_STAMP_INSTALL) | $$(dir $$@)/. - cp -f libffi/build/inst/lib/libffi-*/include/$(notdir $@) $@ + cp -f libffi/build/inst/include/$(notdir $@) $@ $(eval $(call clean-target,libffi,, \ - libffi/build $(wildcard libffi/stamp.ffi.*) libffi/dist-install)) + $(wildcard libffi/stamp.ffi.*) libffi/dist-install)) endif -- cgit v1.2.1