1 files changed, 9 insertions, 9 deletions

diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index 5c9fd333c2..8af447091b 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -8,8 +8,8 @@ PV = "2.3.6+csl-arm-2005q3-2"
 PR = "r11"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 FILESDIR = "${FILE_DIRNAME}/files"
 
@@ -100,10 +100,10 @@ do_compile () {
 }
 
 do_stage() {
-        rm -f ${STAGING_LIBDIR}/libc.so.6
-        oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                   '${STAGING_LIBDIR}/libc.so.6' \
+        rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+        oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+                   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+                   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
                    install-headers install-lib
 
         install -d ${STAGING_INCDIR}/gnu \
@@ -117,10 +117,10 @@ do_stage() {
                 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
         done
         for i in libc.a libc_pic.a libc_nonshared.a; do
-                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+                install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i"
         done
-        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
 }
 
 require glibc-package.bbclass