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.
8019692: JDK build CC_OPT_HIGHEST setting isn't valid for Sun C++ compiler
authorprr
Tue, 02 Jul 2013 14:25:56 -0700
changeset 18519 93645a7dac66
parent 18518 153791a0895c
child 18526 62ea5b434eeb
child 18749 482096e5f614
8019692: JDK build CC_OPT_HIGHEST setting isn't valid for Sun C++ compiler Reviewed-by: jgodinez
jdk/make/sun/font/Makefile file | annotate | diff | comparison | revisions
jdk/makefiles/CompileNativeLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/sun/font/Makefile	Mon Jul 01 12:39:26 2013 -0700
+++ b/jdk/make/sun/font/Makefile	Tue Jul 02 14:25:56 2013 -0700
@@ -36,7 +36,11 @@
 CPLUSPLUSLIBRARY=true
 
 # Use higher optimization level
+ifeq ($(PLATFORM), windows)
 OPTIMIZATION_LEVEL = HIGHEST
+else
+OPTIMIZATION_LEVEL = HIGHER
+endif
 
 include $(BUILDDIR)/common/Defs.gmk
 
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Mon Jul 01 12:39:26 2013 -0700
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Tue Jul 02 14:25:56 2013 -0700
@@ -1327,11 +1327,12 @@
     BUILD_LIBFONTMANAGER_FONTLIB:=$(FREETYPE2_LIBS)
 endif
 
-LIBFONTMANAGER_OPTIMIZATION:=HIGHEST
+LIBFONTMANAGER_OPTIMIZATION:=HIGH
 
 ifeq ($(OPENJDK_TARGET_OS),windows)
     LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
 				    X11TextRenderer.c
+LIBFONTMANAGER_OPTIMIZATION:=HIGHEST
 else
     LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
 				    lcdglyph.c
jdk-sandbox