summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-06-28 12:31:08 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-06-28 14:13:07 +0000
commit78694667008ce1a508c5a4143765b06af486a0ea (patch)
tree1f8052c2bca764855f13a57a3d7d406f8a4d3b04
parent90bd557646a69350662f2ffaf619b810cc9b00f3 (diff)
downloaddefinitions-78694667008ce1a508c5a4143765b06af486a0ea.tar.gz
Fix libffi build
libffi places its build output into a directory named after whatever architecture it thinks we're building on. That is named based on the output of `./config.guess`. Our install rules were assuming that would match the output of `gcc -dumpmachine`, but it doesn't when building with BuildStream's `gnu-toolchain` bootstrap.
-rw-r--r--elements/core/libffi.bst4
1 files changed, 2 insertions, 2 deletions
diff --git a/elements/core/libffi.bst b/elements/core/libffi.bst
index a62818f3..d7d3c354 100644
--- a/elements/core/libffi.bst
+++ b/elements/core/libffi.bst
@@ -12,5 +12,5 @@ config:
install-commands:
- make DESTDIR="%{install-root}"/ install
- mkdir -p "%{install-root}"/usr/include
- - cp "$(gcc -dumpmachine)"/include/ffi.h "%{install-root}"/usr/include/
- - cp "$(gcc -dumpmachine)"/include/ffitarget.h "%{install-root}"/usr/include/
+ - cp "$(sh ./config.guess)"/include/ffi.h "%{install-root}"/usr/include/
+ - cp "$(sh ./config.guess)"/include/ffitarget.h "%{install-root}"/usr/include/