Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 5:929222887724

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6638571: Fix freetype sanity check to work on solaris 64bit Summary: Missing -xarch options to build for 64bit Reviewed-by: xdono
author ohair
date Tue, 04 Mar 2008 09:50:30 -0800
parents 80486f9d9221
children 12b0d64c4953
files make/tools/freetypecheck/Makefile
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/tools/freetypecheck/Makefile	Tue Mar 04 09:49:22 2008 -0800
+++ b/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