summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Ebenfeld <sven.ebenfeld@vaillant-group.com>2016-07-25 08:16:57 +0200
committerMaxin B. John <maxin.john@intel.com>2016-08-09 12:28:08 +0300
commit4c9fa7bd9a00bacc55fb2217d62d42e887221f5b (patch)
tree261665a094622adf52d1d7972f3ac042b745e665
parent4ae7c0c40e1f8fccc98d2f58cf61ef58c5a27da6 (diff)
downloadmeta-java-4c9fa7bd9a00bacc55fb2217d62d42e887221f5b.tar.gz
openjdk-8: ignore wrong GCCVERSION-flag
During my recipe parsing, GCCVERSION in the cross case seems to be 'l' this leads to a ValueError during recipe parsing. Therefore check type before trying to parse the version flag. Signed-off-by: Sven Ebenfeld <sven.ebenfeld@vaillant-group.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 7ad802a..c2f9eb4 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -271,8 +271,10 @@ def version_specific_cflags(d):
271 # doesn't work anyway. 271 # doesn't work anyway.
272 version = d.getVar('GCCVERSION', expand=True)[0] 272 version = d.getVar('GCCVERSION', expand=True)[0]
273 273
274 extraflags = d.getVar('FLAGS_GCC%d' % int(version), True) or '' 274 if version.isdigit():
275 return extraflags 275 extraflags = d.getVar('FLAGS_GCC%d' % int(version), True) or ''
276 return extraflags
277 return ''
276 278
277CFLAGS_append = " ${@version_specific_cflags(d)}" 279CFLAGS_append = " ${@version_specific_cflags(d)}"
278CXXFLAGS_append = " ${@version_specific_cflags(d)}" 280CXXFLAGS_append = " ${@version_specific_cflags(d)}"