bitbake.conf: Move SDK_NAME and SDK_PREFIX into bitbake.conf

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2035 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 5 insertions, 4 deletions

diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 38df66eb4d..8067798000 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -2,8 +2,6 @@
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
 
-SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
-
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
 
@@ -18,7 +16,7 @@ CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 
-prefix = "/usr/local/${SDK_NAME}"
+prefix = "${SDK_PREFIX}"
 exec_prefix = "${prefix}"
 base_prefix = "${exec_prefix}"
 
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 296f2c9abd..f75e7c59de 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -180,6 +180,9 @@ DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
 DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
 
+SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
+SDK_PREFIX = "/usr/local/${SDK_NAME}"
+
 ##################################################################
 # Kernel info.
 ##################################################################
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
index 6a1b8e71b9..3856fe1ca6 100644
--- a/meta/conf/external_toolchain.conf
+++ b/meta/conf/external_toolchain.conf
@@ -1,6 +1,6 @@
 TARGET_VENDOR = "-poky"
 
-EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}"
+EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}"
 
 PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"