Skip to content

Commit 168a471

Browse files
committedJan 29, 2025
8348830: LIBFONTMANAGER optimization is always HIGHEST
Reviewed-by: erikj, prr, serb
1 parent 55c3e78 commit 168a471

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed
 

‎make/modules/java.desktop/lib/ClientLibraries.gmk

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -360,8 +360,6 @@ else
360360
LIBFONTMANAGER_JDK_LIBS += libfreetype
361361
endif
362362

363-
LIBFONTMANAGER_OPTIMIZATION := HIGHEST
364-
365363
ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
366364
# gcc (and to an extent clang) is particularly bad at optimizing these files,
367365
# causing a massive spike in compile time. We don't care about these
@@ -372,7 +370,6 @@ endif
372370

373371
ifeq ($(call isTargetOs, windows), true)
374372
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c X11TextRenderer.c
375-
LIBFONTMANAGER_OPTIMIZATION := HIGHEST
376373
else ifeq ($(call isTargetOs, macosx), true)
377374
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c X11TextRenderer.c \
378375
fontpath.c lcdglyph.c
@@ -393,7 +390,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
393390
AccelGlyphCache.c, \
394391
CFLAGS := $(LIBFONTMANAGER_CFLAGS), \
395392
CXXFLAGS := $(LIBFONTMANAGER_CFLAGS), \
396-
OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
393+
OPTIMIZATION := HIGHEST, \
397394
CFLAGS_windows = -DCC_NOEX, \
398395
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
399396
EXTRA_SRC := $(LIBFONTMANAGER_EXTRA_SRC), \

0 commit comments

Comments
 (0)
Please sign in to comment.