From 4fc8836379b3a4534c392a29b4bf70000b632232 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 Aug 2015 18:26:11 -0700 Subject: glibc: Consider adding -Wno-error in cases when not using -O2 glibc has recently turned on Werror globally which is good but then not all option combos are well tested so there still remains cleanup needed when not using -O2, so lets just disable Werror in such cases, until fixed upstream Change-Id: I2d491c360a15b0752c97ff77ee0faaeede6e8d2a (From OE-Core master rev: 52a90e8e592ddd228939e15d7fd0d69f3c1e816f) (From OE-Core rev: 6f358676c33854cd6b02f41232875cf779cde1b8) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index da56bc90a1..1c2f1e86ca 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -12,12 +12,20 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" # 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) - if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": + if bb.utils.contains("SELECTED_OPTIMIZATION", "-O2", "x", "", d) == "x": + return selected_optimization + elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O", "x", "", d) == "x": + bb.note("glibc can't be built with -O, -O -Wno-error will be used instead.") + return selected_optimization.replace("-O", "-O -Wno-error") + elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": bb.note("glibc can't be built with -O0, -O2 will be used instead.") return selected_optimization.replace("-O0", "-O2") elif bb.utils.contains("SELECTED_OPTIMIZATION", "-Os", "x", "", d) == "x": bb.note("glibc can't be built with -Os, -Os -Wno-error will be used instead.") return selected_optimization.replace("-Os", "-Os -Wno-error") + elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O1", "x", "", d) == "x": + bb.note("glibc can't be built with -O1, -O1 -Wno-error will be used instead.") + return selected_optimization.replace("-O1", "-O1 -Wno-error") return selected_optimization SELECTED_OPTIMIZATION := "${@get_optimization(d)}" -- cgit v1.2.3-54-g00ecf