aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2011-11-16 14:17:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-17 14:06:04 +0000
commit5b9877aa55e28ba06410592350e7e5106ebdf6cb (patch)
tree92ed15d6aebee2903d881a94d6deb01d1c6bc783
parent2f7b3710d2879ae55ec7e5d0b11958a29cfe96e5 (diff)
downloadopenembedded-core-contrib-5b9877aa55e28ba06410592350e7e5106ebdf6cb.tar.gz
bitbake.conf: add a couple explicit vardeps
Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 442fd4693c..01f064cbc6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -502,6 +502,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
+SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
BUILD_OPTIMIZATION = "-O2 -pipe"
##################################################################
@@ -713,7 +714,7 @@ 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)}"
-
+COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
# Make sure MACHINE isn't exported
# (breaks binutils at least)