Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8141416: "expr: syntax error" due to gcc -dumpversion excluding micro
authorsimonis
Thu, 05 Nov 2015 10:55:58 +0100
changeset 33634 d649141cb203
parent 33632 038347770a9e
child 33635 7026b90fb57b
8141416: "expr: syntax error" due to gcc -dumpversion excluding micro Reviewed-by: erikj, stuefe
hotspot/make/linux/makefiles/gcc.make file | annotate | diff | comparison | revisions 
--- a/hotspot/make/linux/makefiles/gcc.make	Wed Nov 04 07:23:23 2015 -1000
+++ b/hotspot/make/linux/makefiles/gcc.make	Thu Nov 05 10:55:58 2015 +0100
@@ -61,6 +61,11 @@
   CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
   CC_VER_MINOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
   CC_VER_MICRO := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f3)
+  # Workaround Ubuntu bug where -dumpversion doesn't print a micro version
+  # https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1360404
+  ifeq ($(CC_VER_MICRO),)
+    CC_VER_MICRO := "0"
+  endif
 endif
 
 ifeq ($(USE_CLANG), true)
jdk-sandbox