bitbake.conf: set CPU_FEATURES before it is used not after

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

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 782a9c2a31..e614057cb8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -539,6 +539,9 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL
 # Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
 #OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
 
+CPU_FEATURES ?= ""
+CPU_FEATURES_arm ?= "vfp"
+
 ##################################################################
 # Include the rest of the config files.
 ##################################################################
@@ -612,6 +615,3 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
-
-CPU_FEATURES ?= ""
-CPU_FEATURES_arm ?= "vfp"