Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 3432:14033e1600ac
6997210: Solaris 11 has no development support for DGA: Cannot build JDK
Reviewed-by: bae, ohair
author | prr |
---|---|
date | Fri, 24 Dec 2010 09:31:32 -0800 |
parents | 99c540ac926c |
children | 70bfa0af3969 |
files | make/sun/Makefile |
diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/sun/Makefile Fri Dec 24 14:05:42 2010 +0300 +++ b/make/sun/Makefile Fri Dec 24 09:31:32 2010 -0800 @@ -42,7 +42,15 @@ ifndef OPENJDK ifeq ($(PLATFORM), solaris) ifneq ($(ARCH), amd64) - DGA_SUBDIR = jdga + # Solaris 11 does not have support for new compilation of DGA code. + OS_VERSION = $(shell uname -r) + OS_MAJOR_VERSION := $(call MajorVersion,$(OS_VERSION)) + OS_MINOR_VERSION := $(call MinorVersion,$(OS_VERSION)) + ifeq ($(shell $(EXPR) $(OS_MAJOR_VERSION) == 5), 1) + ifeq ($(shell $(EXPR) $(OS_MINOR_VERSION) \<= 10), 1) + DGA_SUBDIR = jdga + endif + endif endif endif endif