2 files changed, 5 insertions, 0 deletions

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 82624cba9c..1a078b415b 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -50,6 +50,10 @@ sysroot_stage_dirs() {
         then
                 sysroot_stage_libdir $from${base_libdir} $to${base_libdir}
         fi
+        if [ -d $from${nonarch_base_libdir} ]
+        then
+                sysroot_stage_libdir $from${nonarch_base_libdir} $to${nonarch_base_libdir}
+        fi
         sysroot_stage_dir $from${datadir} $to${datadir}
         # We don't care about docs/info/manpages/locales
         rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 578c29f46c..2e3856a2d1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -21,6 +21,7 @@ export exec_prefix = "/usr"
 export base_bindir = "${base_prefix}/bin"
 export base_sbindir = "${base_prefix}/sbin"
 export base_libdir = "${base_prefix}/${baselib}"
+export nonarch_base_libdir = "${base_prefix}/lib"
 
 # Architecture independent paths
 export datadir = "${prefix}/share"