aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-08-05 13:29:53 +0200
committerKoen Kooi <koen.kooi@linaro.org>2014-08-06 08:13:23 +0200
commita9717cc19bb6fa9d95385ebd5fea2b3b0826cad9 (patch)
tree9dfc626735963ce53ce27b833319de34ef3ce8c8
parent916ba608aadde37539150c044caf3604b5405a44 (diff)
downloadmeta-linaro-a9717cc19bb6fa9d95385ebd5fea2b3b0826cad9.tar.gz
bootwrapper: fix dependencies and compile flags
Bootwrapper needs 'userspace' bits like libgcc and libgcc_s, which kernel.bbclass tries hard to hide. Work around this with explicit DEPENDS on libgcc and restoring *FLAGS in do_compile_append. Change-Id: Icdda8edc83b8b93c7a4796a72ce4aba4770c6721 Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-linaro/recipes-kernel/linux/bootwrapper.inc15
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-linaro/recipes-kernel/linux/bootwrapper.inc b/meta-linaro/recipes-kernel/linux/bootwrapper.inc
index 4b696db2..c3a56348 100644
--- a/meta-linaro/recipes-kernel/linux/bootwrapper.inc
+++ b/meta-linaro/recipes-kernel/linux/bootwrapper.inc
@@ -5,10 +5,25 @@ SRCREV_bootwrapper = "2ff0b45423226d3de898a52a81b8e90b20fecd60"
BW = "${WORKDIR}/bootwrapper"
DTBDIR="${S}/arch/arm64/boot/dts/"
+# Bootwrapper needs libgcc_s.so
+DEPENDS =+ "libgcc"
+
+export WRAPCFLAGS = "${CFLAGS}"
+export WRAPCPPFLAGS = "${CPPFLAGS}"
+export WRAPCXXFLAGS = "${CXXFLAGS}"
+export WRAPLDFLAGS = "${LDFLAGS}"
+
do_compile_append() {
cd ${S}
oe_runmake dtbs
cd ${BW}
+
+ # Ensure the compile can find libgcc.a and other userspace friends
+ export CFLAGS="${WRAPCFLAGS}"
+ export CPPFLAGS="${WRAPCPPFLAGS}"
+ export CXXFLAGS="${WRAPCXXFLAGS}"
+ export LDFLAGS="${WRAPLDFLAGS}"
+
autoreconf -vfi
./configure --host=aarch64-linux-gnu \
--with-kernel-dir="${S}" \