From 78694667008ce1a508c5a4143765b06af486a0ea Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 28 Jun 2017 12:31:08 +0000 Subject: 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. --- elements/core/libffi.bst | 4 ++-- 1 file 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/ -- cgit v1.2.1