[commit: ghc] master: Tweak build rules for libffi (0d72999)
Ian Lynagh
igloo at earth.li
Fri Apr 22 17:21:34 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0d72999279cf583336416a4c76de769bfc839b97
>---------------------------------------------------------------
commit 0d72999279cf583336416a4c76de769bfc839b97
Author: Ian Lynagh <igloo at earth.li>
Date: Fri Apr 22 12:56:02 2011 +0100
Tweak build rules for libffi
We were doing
echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'
but the only x86 value HOSTPLATFORM can have is i386.
We now tell libffi its build platform again, but we now tell it it's
$(BUILDPLATFORM) rather than $(HOSTPLATFORM).
>---------------------------------------------------------------
libffi/ghc.mk | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 2edbc41..1efb8fb 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -34,8 +34,6 @@
#
# We use libffi's own configuration stuff.
-PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
-
# 2007-07-05
# Passing
# as_ln_s='cp -p'
@@ -125,7 +123,7 @@ $(libffi_STAMP_CONFIGURE):
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
- --host=$(PLATFORM)
+ --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
# libffi.so needs to be built with the correct soname.
# NOTE: this builds libffi_convience.so with the incorrect
More information about the Cvs-ghc
mailing list