Attachment #562314 for bug #675920

View | Details | Raw Unified | Return to bug 675920
Collapse All | Expand All

Lines 233-239 checks: check_os_version check_j2se_version Link Here

(-)a/openjdk-boot/hotspot/make/linux/Makefile (-1 / +1 lines)
233	# Solaris 2.5.1, 2.6).	233	# Solaris 2.5.1, 2.6).
234	# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.	234	# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
235		235
236	SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%	236	SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% 5%
237	OS_VERSION := $(shell uname -r)	237	OS_VERSION := $(shell uname -r)
238	EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))	238	EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
239		239

Lines 233-239 checks: check_os_version check_j2se_version Link Here

(-)a/openjdk/hotspot/make/linux/Makefile (-1 / +1 lines)
233	# Solaris 2.5.1, 2.6).	233	# Solaris 2.5.1, 2.6).
234	# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.	234	# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
235		235
236	SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%	236	SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% 5%
237	OS_VERSION := $(shell uname -r)	237	OS_VERSION := $(shell uname -r)
238	EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))	238	EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
239		239

Return to bug 675920