summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-12-27 09:11:16 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-12-27 09:11:16 +0100
commit9ae78b0ac20199982b994122889a04c6124e01b2 (patch)
tree2087a6d1cbd2caa4e116e3f09965fc082b119ae1
parentadd6a30317ca7307a91563afbbf102c3771ee246 (diff)
downloadhaskell-9ae78b0ac20199982b994122889a04c6124e01b2.tar.gz
Copy GHC's config.guess/sub over libffi's versions
This should address #9924 as GHC's config.guess/sub versions need to be up to date anyway.
-rw-r--r--libffi/ghc.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index ec37f0c533..abbe87f23c 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -58,6 +58,10 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
cat libffi-tarballs/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
mv libffi/libffi-* libffi/build
+# update config.guess/config.sub
+ $(CP) "$(TOP)/config.guess" libffi/build/config.guess
+ $(CP) "$(TOP)/config.sub" libffi/build/config.sub
+
# We have to fake a non-working ln for configure, so that the fallback
# option (cp -p) gets used instead. Otherwise the libffi build system
# will use cygwin symbolic links which cannot be read by mingw gcc.