# HG changeset patch
# User ohair
# Date 1204653030 28800
# Node ID a2b62af4c8c5bddb8a4bc6dd8b30d9e354472ed9
# Parent  e0246cd553a52bae538c0398eb9054f1077df531
6638571: Fix freetype sanity check to work on solaris 64bit
Summary: Missing -xarch options to build for 64bit
Reviewed-by: xdono

diff -r e0246cd553a5 -r a2b62af4c8c5 jdk/make/tools/freetypecheck/Makefile
--- a/jdk/make/tools/freetypecheck/Makefile	Tue Mar 04 09:49:22 2008 -0800
+++ b/jdk/make/tools/freetypecheck/Makefile	Tue Mar 04 09:50:30 2008 -0800
@@ -38,7 +38,14 @@
 
 all: $(FT_TEST_PATH)
 
-FT_OPTIONS  = -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2
+# Start with CFLAGS (which gets us the required -xarch setting on solaris)
+ifeq ($(PLATFORM), windows)
+  FT_OPTIONS  =
+else
+  FT_OPTIONS  = $(CFLAGS)
+endif
+
+FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2
 FT_OPTIONS += $(XARCH)
 
 #add runtime library search path