Skip to content

Commit 86d39a6

Browse files
committed
8282588: [11] set harfbuzz compilation flag to -std=c++11
Reviewed-by: mdoerr
1 parent 8a9f20a commit 86d39a6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

make/lib/Awt2dLibraries.gmk

+3-1
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
542542
else
543543
LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
544544
HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
545+
# Modern HarfBuzz requires c++11.
546+
HARFBUZZ_CXXFLAGS := -std=c++11
545547

546548
ifneq ($(OPENJDK_TARGET_OS), windows)
547549
HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
@@ -624,7 +626,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
624626
AccelGlyphCache.c, \
625627
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
626628
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
627-
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
629+
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS) $(HARFBUZZ_CXXFLAGS), \
628630
OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
629631
CFLAGS_windows = -DCC_NOEX, \
630632
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \

0 commit comments

Comments
 (0)