From 046ae6a38d829048663fe1afb1f67de1fbe2e3b5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Sep 2009 14:11:21 +0100 Subject: poky/moblin: Update SDKPATH and SDK_NAME to use SDK_ARCH and remove pointless path addition Signed-off-by: Richard Purdie --- meta-moblin/conf/distro/moblin.conf | 4 ++-- meta/conf/distro/poky.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf index 1d5fe795c..5efba45b7 100644 --- a/meta-moblin/conf/distro/moblin.conf +++ b/meta-moblin/conf/distro/moblin.conf @@ -52,8 +52,8 @@ require conf/distro/include/poky-${POKYMODE}.inc POKYLIBC ?= "glibc" require conf/distro/include/poky-${POKYLIBC}.inc -SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" -SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" +SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" +SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}" CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index a89132f6a..ab74cfc44 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -58,8 +58,8 @@ require conf/distro/include/poky-${POKYMODE}.inc POKYLIBC ?= "glibc" require conf/distro/include/poky-${POKYLIBC}.inc -SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}" -SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" +SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" +SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}" CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -- cgit v1.2.3