Mercurial > hg > icedtea8-forest > hotspot
changeset 7424:877471da7fbb icedtea-3.0.0pre02
PR1942: Bug reports lack IcedTea version & distribution packaging information
| author | andrew |
|---|---|
| date | Thu, 21 Aug 2014 23:54:30 +0100 |
| parents | 22d29c372fc4 |
| children | e72112189304 |
| files | make/linux/makefiles/buildtree.make make/linux/makefiles/vm.make make/solaris/makefiles/vm.make make/windows/makefiles/vm.make |
| diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/buildtree.make Tue Aug 19 23:57:06 2014 +0100 +++ b/make/linux/makefiles/buildtree.make Thu Aug 21 23:54:30 2014 +0100 @@ -219,6 +219,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 "$(LP64_SETTING/$(DATA_MODE))"; \ echo; \
--- a/make/linux/makefiles/vm.make Tue Aug 19 23:57:06 2014 +0100 +++ b/make/linux/makefiles/vm.make Thu Aug 21 23:54:30 2014 +0100 @@ -99,11 +99,11 @@ ${VM_DISTRO} ifdef DERIVATIVE_ID -CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\"" +CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\"" endif ifdef DISTRIBUTION_ID -CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\"" +CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\"" endif # This is VERY important! The version define must only be supplied to vm_version.o
--- a/make/solaris/makefiles/vm.make Tue Aug 19 23:57:06 2014 +0100 +++ b/make/solaris/makefiles/vm.make Thu Aug 21 23:54:30 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 @@ -105,7 +105,7 @@ endif # ifneq ($(LP64), 1) ifdef DISTRIBUTION_ID -CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\"" +CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\"" endif # CFLAGS_WARN holds compiler options to suppress/enable warnings.
--- a/make/windows/makefiles/vm.make Tue Aug 19 23:57:06 2014 +0100 +++ b/make/windows/makefiles/vm.make Thu Aug 21 23:54:30 2014 +0100 @@ -68,11 +68,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"