From 2a08b60aff9d9bc2f84ac0e6249f29b31f9b0bd7 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 3 Dec 2004 21:21:40 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:packages into
 odin.sc.ti.com:/home/kergoth/code/packages

2004/12/03 15:21:29-06:00 ti.com!kergoth
Update the PACKAGE_ARCH bits to suck a bit less.

BKrev: 41b0d8e4rsL0NS7oeNg9h5Mf9Y9g4A
---
 conf/oe.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/oe.conf b/conf/oe.conf
index 5e186c3820..11b5631e53 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -45,7 +45,7 @@ TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 
 PACKAGE_ARCH = "${HOST_ARCH}"
-MACHINE_ARCH = "${MACHINE}"
+MACHINE_ARCH = "${@[oe.data.getVar('PACKAGE_ARCH', d, 1), oe.data.getVar('MACHINE', d, 1)][bool(oe.data.getVar('MACHINE', d, 1))]}"
 
 ##################################################################
 # Date/time variables.
-- 
cgit v1.2.3