image-mklibs: ensure sysroot is correctly set when calling gcc

[YOCTO #2519]

When getting gcc from sstate, it is possible to get a gcc with a bogus
sysroot configuration, as discussed in [1] or in [YOCTO #2519].

mklibs script will eventually call gcc, so we need to make sure that it
provides gcc with the right sysroot location.

[1] http://lists.openembedded.org/pipermail/openembedded-core/2013-September/084159.html

(From OE-Core master rev: 3a66dd762e493ad2cda57110be67c3b06628050a)

(From OE-Core rev: 05d09149216aee6681fa1c4c6bc7ec4ea7edda8b)

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index 66b0f5251e..beef1b41da 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -40,6 +40,7 @@ mklibs_optimize_image_doit() {
                 --ldlib ${dynamic_loader} \
                 --libdir ${baselib} \
                 --sysroot ${PKG_CONFIG_SYSROOT_DIR} \
+                --gcc-options "--sysroot=${PKG_CONFIG_SYSROOT_DIR}" \
                 --root ${IMAGE_ROOTFS} \
                 --target `echo ${TARGET_PREFIX} | sed 's/-$//' ` \
                 -d ${WORKDIR}/mklibs/dest \