Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authorohair
Tue, 04 Mar 2008 09:50:30 -0800
changeset 28 a2b62af4c8c5
parent 27 e0246cd553a5
child 29 b8bedccd805d
6638571: Fix freetype sanity check to work on solaris 64bit Summary: Missing -xarch options to build for 64bit Reviewed-by: xdono
jdk/make/tools/freetypecheck/Makefile file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox