summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-01-29 12:35:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:38:00 +0000
commit3d2455c1959283b956cb7536cd866717fefc10e8 (patch)
treeee2f4e90a5c87bde149874ada69d95a32228b0f6
parent6fef0d528158e6317793b1ebfa26a7b5413c3e80 (diff)
downloadopenembedded-core-contrib-3d2455c1959283b956cb7536cd866717fefc10e8.tar.gz
openembedded-core-contrib-3d2455c1959283b956cb7536cd866717fefc10e8.tar.bz2
openembedded-core-contrib-3d2455c1959283b956cb7536cd866717fefc10e8.zip
systemtap_git.inc: do not immediate expand SELECTED_OPTIMIZATION
We need to expand SELECTED_OPTIMIZATION later, so do not immediate expansion, and do the work in anonymous python function. It is reasonable to give an error for -O0. [YOCTO #7058] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 7f9ae0b522..656f15f808 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -17,12 +17,8 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
S = "${WORKDIR}/git"
# systemtap can't be built without optimization, if someone tries to compile an
-# entire image as -O0, we override it with -O2 here and give a note about it.
-def get_optimization(d):
- selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
+# entire image as -O0, break with fatal.
+python () {
if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
- bb.note("systemtap can't be built with -O0, -O2 will be used instead.")
- return selected_optimization.replace("-O0", "-O2")
- return selected_optimization
-
-SELECTED_OPTIMIZATION := "${@get_optimization(d)}"
+ bb.fatal("systemtap can't be built with -O0, using -O1 -Wno-error or -O1 instead.")
+}