From 06ebbe3c1b203e826b503fc79a2cb4fa39cf7f38 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 1 Oct 2008 12:09:10 +0000
Subject: cross bbclass: sync with poky

---
 classes/cross.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'classes')

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index a35f4dfb79..9dddca127a 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -3,8 +3,11 @@
 EXCLUDE_FROM_WORLD = "1"
 
 # Save PACKAGE_ARCH before changing HOST_ARCH
-OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
-PACKAGE_ARCH = ${OLD_PACKAGE_ARCH}
+OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
 
 PACKAGES = ""
 
@@ -49,8 +52,8 @@ bindir = "${exec_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
 libexecdir = "${exec_prefix}/libexec"
 libdir = "${exec_prefix}/lib"
-includedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
-oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
+includedir = "${exec_prefix}/include"
+oldincludedir = "${exec_prefix}/include"
 
 do_stage () {
 	oe_runmake install
-- 
cgit v1.2.3