[oe-commits] Thomas Zimmermann : shr/merge: move TOOLCHAIN_TYPE before arngstrom-2007-for-openmoko.inc include

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: a12210a49955e7f9a2a13229458159e8ab9e77b6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a12210a49955e7f9a2a13229458159e8ab9e77b6

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Wed Oct 14 20:34:52 2009 +0000

shr/merge: move TOOLCHAIN_TYPE before arngstrom-2007-for-openmoko.inc include

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/shr.conf |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 37163dd..a992104 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -9,6 +9,10 @@
 # it will be already set to en-gb
 IMAGE_LINGUAS ?= "en-us"
 
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc
 
@@ -21,10 +25,6 @@ DISTRO_VERSION = "-${DATE}"
 DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
-# Set the toolchain type (internal, external) and brand (generic, csl etc.)
-TOOLCHAIN_TYPE ?= "internal"
-TOOLCHAIN_BRAND ?= ""
-
 OVERRIDES = "local:${MACHINE}:shr:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 INHERIT += "packaged-staging"