Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 3:e4f19efd20b4
6654456: OpenJDK build problem with freetype makefiles
Summary: ifdef test on OPENJDK before it gets set based on source tree contents
Reviewed-by: xdono
author | ohair |
---|---|
date | Tue, 04 Mar 2008 09:47:43 -0800 |
parents | 8266cb7549d3 |
children | 80486f9d9221 |
files | make/common/shared/Platform.gmk |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk Fri Feb 29 20:04:01 2008 -0800 +++ b/make/common/shared/Platform.gmk Tue Mar 04 09:47:43 2008 -0800 @@ -93,10 +93,8 @@ # Normal boot jdk is previous release, but a hard requirement is a 1.5 boot REQUIRED_BOOT_VER = 1.5 -#This is specific to OpenJDK build -ifdef OPENJDK - REQUIRED_FREETYPE_VERSION=2.3.0 -endif +# If we are using freetype, this is the required version +REQUIRED_FREETYPE_VERSION=2.3.0 # # Prune out all known SCM (Source Code Management) directories