changeset 18519:93645a7dac66

8019692: JDK build CC_OPT_HIGHEST setting isn't valid for Sun C++ compiler Reviewed-by: jgodinez
author prr
date Tue, 02 Jul 2013 14:25:56 -0700
parents 153791a0895c
children 62ea5b434eeb 482096e5f614
files jdk/make/sun/font/Makefile jdk/makefiles/CompileNativeLibraries.gmk
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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