[OE-core] [PATCH] cross.bbclass: Preserve the bitbake configuration

[Amarnath Valluri]

While preparing target_libdir and target_base_libdir we should preserve the
bitbake configuration used for 'base_libdir' and 'libdir' instead of assuming
${base|exec}_prefix/${baselib}, which is not true in case of merged '/usr'.

Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
---
 meta/classes/cross.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 8757303..0195b26 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -53,8 +53,10 @@ SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}"
 target_base_prefix := "${base_prefix}"
 target_prefix := "${prefix}"
 target_exec_prefix := "${exec_prefix}"
-target_base_libdir = "${target_base_prefix}/${baselib}"
-target_libdir = "${target_exec_prefix}/${baselib}"
+base_libdir_suffix := "${@base_libdir.split(base_prefix)[1] if base_prefix != "" else base_libdir}"
+libdir_suffix := "${@libdir.split(exec_prefix)[1] if exec_prefix != "" else libdir}"
+target_base_libdir = "${target_base_prefix}${base_libdir_suffix}"
+target_libdir = "${target_exec_prefix}${libdir_suffix}"
 target_includedir := "${includedir}"
 
 # Overrides for paths
-- 
2.7.4