diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 0c5c2c3..83828e1 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -238,13 +238,9 @@ def version_specific_cflags(d): | |||
238 | if bb.data.inherits_class('native', d): | 238 | if bb.data.inherits_class('native', d): |
239 | from subprocess import Popen, PIPE | 239 | from subprocess import Popen, PIPE |
240 | 240 | ||
241 | cmd = d.expand('${CPP} -P -').split() | 241 | cmd = d.expand('${CC} -dumpversion').split() |
242 | cc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) | 242 | cc = Popen(cmd, stdout=PIPE, stderr=PIPE) |
243 | # This check is GCC specific. Clang always returns 4. For Clang | 243 | version = cc.communicate()[0].decode('utf-8')[0] |
244 | # __clang_major__ and __clang_minor__ need to be checked. Ideally | ||
245 | # __GNUC_MINOR__ would be checked as well, but for this recipe | ||
246 | # GCC major is all we care about. | ||
247 | version = cc.communicate(b'__GNUC__')[0].decode('utf-8')[0] | ||
248 | else: | 244 | else: |
249 | # in the cross case, trust that GCCVERSION is correct. This won't | 245 | # in the cross case, trust that GCCVERSION is correct. This won't |
250 | # work if the native toolchain is Clang, but as of this writing that | 246 | # work if the native toolchain is Clang, but as of this writing that |