diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-08-15 18:26:11 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-19 17:57:48 +0100 |
| commit | 52a90e8e592ddd228939e15d7fd0d69f3c1e816f (patch) | |
| tree | c8a8207b93d73b5b57167477826dc7f44783b1fd | |
| parent | 3b1a2baa95fee7479e85379c0f6f4d54c0db2042 (diff) | |
| download | openembedded-core-contrib-52a90e8e592ddd228939e15d7fd0d69f3c1e816f.tar.gz | |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 74ad0b5fbd..0cccd0533e 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)}" |