summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-15 18:26:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:34 +0100
commit625e0ec8b5e5f1c39b3bfad0e6adfecaf957d689 (patch)
tree35adbaf4808e1889de389bf778c5d74e036675a7 /meta/recipes-core
parentb7cd76810a0373b233634ff3443d4af6b8b6ab68 (diff)
downloadpoky-625e0ec8b5e5f1c39b3bfad0e6adfecaf957d689.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 (From OE-Core rev: 52a90e8e592ddd228939e15d7fd0d69f3c1e816f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glibc/glibc.inc10
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}"
12# entire image as -O0, we override it with -O2 here and give a note about it. 12# entire image as -O0, we override it with -O2 here and give a note about it.
13def get_optimization(d): 13def get_optimization(d):
14 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True) 14 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
15 if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": 15 if bb.utils.contains("SELECTED_OPTIMIZATION", "-O2", "x", "", d) == "x":
16 return selected_optimization
17 elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O", "x", "", d) == "x":
18 bb.note("glibc can't be built with -O, -O -Wno-error will be used instead.")
19 return selected_optimization.replace("-O", "-O -Wno-error")
20 elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
16 bb.note("glibc can't be built with -O0, -O2 will be used instead.") 21 bb.note("glibc can't be built with -O0, -O2 will be used instead.")
17 return selected_optimization.replace("-O0", "-O2") 22 return selected_optimization.replace("-O0", "-O2")
18 elif bb.utils.contains("SELECTED_OPTIMIZATION", "-Os", "x", "", d) == "x": 23 elif bb.utils.contains("SELECTED_OPTIMIZATION", "-Os", "x", "", d) == "x":
19 bb.note("glibc can't be built with -Os, -Os -Wno-error will be used instead.") 24 bb.note("glibc can't be built with -Os, -Os -Wno-error will be used instead.")
20 return selected_optimization.replace("-Os", "-Os -Wno-error") 25 return selected_optimization.replace("-Os", "-Os -Wno-error")
26 elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O1", "x", "", d) == "x":
27 bb.note("glibc can't be built with -O1, -O1 -Wno-error will be used instead.")
28 return selected_optimization.replace("-O1", "-O1 -Wno-error")
21 return selected_optimization 29 return selected_optimization
22 30
23SELECTED_OPTIMIZATION := "${@get_optimization(d)}" 31SELECTED_OPTIMIZATION := "${@get_optimization(d)}"