summaryrefslogtreecommitdiff
path: root/libffi/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-05-26 19:04:45 +0100
committerIan Lynagh <igloo@earth.li>2012-05-26 19:04:45 +0100
commitc87371b17be913e5d966c2fa7dcaaa17beb992af (patch)
treedbbe1c5ed7990339482ce30e7447b32824820b1a /libffi/ghc.mk
parent278bc1df5f52d3cb2cda49379268a400296e21f7 (diff)
downloadhaskell-c87371b17be913e5d966c2fa7dcaaa17beb992af.tar.gz
Specify the libdir to use when building libffi
Fixes the build on platforms that default to using a directory called lib64. Reported by Gabriel Dos Reis.
Diffstat (limited to 'libffi/ghc.mk')
-rw-r--r--libffi/ghc.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index fc474d2010..07d6d3d74c 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -70,8 +70,11 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
mv libffi/build/ltmain.sh libffi/build/ltmain.sh.orig
sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libffi/build/ltmain.sh.orig > libffi/build/ltmain.sh
-# Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
-# warnings off or the compilation of libffi might fail due to warnings
+# * Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
+# warnings off or the compilation of libffi might fail due to warnings;
+# hence the -w flags.
+# * We specify --libdir, as we need to know the path to libffi.a, but on
+# some platforms it defaults to .../lib64/ rather than .../lib/.
cd libffi && \
$(LIBFFI_PATH_MANGLE) \
cd build && \
@@ -83,6 +86,7 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
LDFLAGS="$(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE1) -w" \
"$(SHELL)" configure \
--prefix=$(TOP)/libffi/build/inst \
+ --libdir=$(TOP)/libffi/build/inst/lib \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
--host=$(TargetPlatformFull)