summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2020-04-30 15:15:54 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-05-01 11:22:15 +0200
commit2044442bbc4849c2ca33b1402883cae95de757a2 (patch)
tree21cccb704af59727641f7bcdb285217c3c4ef389
parent69b82f87debb645418bf82e1ca3e6b1ed555832b (diff)
downloadmeta-java-2044442bbc4849c2ca33b1402883cae95de757a2.tar.gz
openjdk-build-helper: Fix decoding GCC major version
GCC in Fedora 32 is up to version 10, so return the whole word instead of the first letter. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--classes/openjdk-build-helper.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
index 8d83e02..4e334c2 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -31,7 +31,7 @@ def openjdk_build_helper_get_build_cflags(d):
31 from subprocess import Popen, PIPE 31 from subprocess import Popen, PIPE
32 cmd = d.expand('%s -dumpversion' % build_cc).split() 32 cmd = d.expand('%s -dumpversion' % build_cc).split()
33 cc = Popen(cmd, stdout=PIPE, stderr=PIPE) 33 cc = Popen(cmd, stdout=PIPE, stderr=PIPE)
34 return cc.communicate()[0].decode('utf-8')[0] 34 return cc.communicate()[0].decode('utf-8').split()[0]
35 35
36 build_cc = d.getVar('BUILD_CC') 36 build_cc = d.getVar('BUILD_CC')
37 version = get_build_cc_version(build_cc) 37 version = get_build_cc_version(build_cc)