diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2014-08-05 13:29:53 +0200 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2014-08-07 07:51:17 +0200 |
| commit | bc63e777ad2748b8bfa7fa70ffd74700fa21a567 (patch) | |
| tree | 89335af62d6b832e0359b7dd27c1d7b4207b9810 | |
| parent | 610ff67118ae495d284626895243fb3c3c42835d (diff) | |
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: I431cf6bcde6982b0c3cdc96a7c17e637653717d1
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
| -rw-r--r-- | meta-linaro/recipes-kernel/linux/bootwrapper.inc | 15 |
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}" \ |