Merge
authorerikj
Thu, 05 Nov 2015 15:08:58 +0100
changeset 33635 7026b90fb57b
parent 33633 8a83967eb351 (current diff)
parent 33634 d649141cb203 (diff)
child 33636 58b6bcd2ecac
Merge
--- a/hotspot/make/linux/makefiles/gcc.make	Thu Nov 05 13:33:18 2015 +0300
+++ b/hotspot/make/linux/makefiles/gcc.make	Thu Nov 05 15:08: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)