From e467c731a73a22b867cf4b5066b25712a04aa888 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 4 Mar 2008 09:47:43 -0800 Subject: [PATCH] 6654456: OpenJDK build problem with freetype makefiles Ifdef test on OPENJDK before it gets set based on source tree contents Reviewed-by: xdono --- jdk/make/common/shared/Platform.gmk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jdk/make/common/shared/Platform.gmk b/jdk/make/common/shared/Platform.gmk index f9f229a8548..915454a940c 100644 --- a/jdk/make/common/shared/Platform.gmk +++ b/jdk/make/common/shared/Platform.gmk @@ -93,10 +93,8 @@ SYSTEM_UNAME := $(shell uname) # 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