/hg/icedtea7-forest/hotspot: PR1903: [REGRESSION] Bug reports no...

[andrew at icedtea.classpath.org]

changeset b517477362d1 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=b517477362d1
author: andrew
date: Wed Aug 13 15:49:58 2014 +0100

	PR1903: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information


diffstat:

 make/linux/makefiles/buildtree.make |  2 ++
 make/linux/makefiles/vm.make        |  4 ++--
 make/solaris/makefiles/vm.make      |  4 ++--
 make/windows/makefiles/vm.make      |  4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r e559a0f8f986 -r b517477362d1 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Mon Aug 11 16:38:33 2014 +0100
+++ b/make/linux/makefiles/buildtree.make	Wed Aug 13 15:49:58 2014 +0100
@@ -210,6 +210,8 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "DERIVATIVE_ID = $(DERIVATIVE_ID)"; \
+	echo "DISTRIBUTION_ID = $(DISTRIBUTION_ID)"; \
 	echo "OPENJDK = $(OPENJDK)"; \
 	echo "OPENJDK_TARGET_CPU_ENDIAN = $(OPENJDK_TARGET_CPU_ENDIAN)"; \
 	echo "ZERO_BUILD = $(ZERO_BUILD)"; \
diff -r e559a0f8f986 -r b517477362d1 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Mon Aug 11 16:38:33 2014 +0100
+++ b/make/linux/makefiles/vm.make	Wed Aug 13 15:49:58 2014 +0100
@@ -102,7 +102,7 @@
   ${VM_DISTRO}
 
 ifdef DERIVATIVE_ID
-CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
+CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
 endif
 
 # This is VERY important! The version define must only be supplied to vm_version.o
@@ -120,7 +120,7 @@
 endif
 
 ifdef DISTRIBUTION_ID
-CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
 endif
 
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
diff -r e559a0f8f986 -r b517477362d1 make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Mon Aug 11 16:38:33 2014 +0100
+++ b/make/solaris/makefiles/vm.make	Wed Aug 13 15:49:58 2014 +0100
@@ -86,7 +86,7 @@
   ${VM_DISTRO}
 
 ifdef DERIVATIVE_ID
-CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
+CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
 endif
 
 # This is VERY important! The version define must only be supplied to vm_version.o
@@ -95,7 +95,7 @@
 vm_version.o: CXXFLAGS += ${JRE_VERSION}
 
 ifdef DISTRIBUTION_ID
-CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
 endif
 
 # Large File Support
diff -r e559a0f8f986 -r b517477362d1 make/windows/makefiles/vm.make
--- a/make/windows/makefiles/vm.make	Mon Aug 11 16:38:33 2014 +0100
+++ b/make/windows/makefiles/vm.make	Wed Aug 13 15:49:58 2014 +0100
@@ -80,11 +80,11 @@
 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
 
 !ifdef DERIVATIVE_ID
-CPP_FLAGS = $(CPP_FLAGS) /D "DERIVATIVE_ID=\"$(DERIVATIVE_ID)\""
+CXX_FLAGS = $(CPP_FLAGS) /D "DERIVATIVE_ID=\"$(DERIVATIVE_ID)\""
 !endif
 
 !ifdef DISTRIBUTION_ID
-CPP_FLAGS = $(CPP_FLAGS) /D "DISTRIBUTION_ID=\"$(DISTRIBUTION_ID)\""
+CXX_FLAGS = $(CPP_FLAGS) /D "DISTRIBUTION_ID=\"$(DISTRIBUTION_ID)\""
 !endif
 
 !if "$(BUILDARCH)" == "ia64"