# HG changeset patch
# User ohair
# Date 1204652863 28800
# Node ID eb94dff5238cf40f3e99a2f67b84d9a3663d33ff
# Parent  74fe6922716dbd4e10b5d5efbf23af551b84a697
6654456: OpenJDK build problem with freetype makefiles
Summary: ifdef test on OPENJDK before it gets set based on source tree contents
Reviewed-by: xdono

diff -r 74fe6922716d -r eb94dff5238c jdk/make/common/shared/Platform.gmk
--- a/jdk/make/common/shared/Platform.gmk	Fri Feb 29 20:04:01 2008 -0800
+++ b/jdk/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