Skip to content

Commit 844f03b

Browse files
committed
8286630: [11] avoid -std=c++11 CXX harfbuzz buildflag on Windows
Reviewed-by: mdoerr, clanger
1 parent 7921cc1 commit 844f03b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

make/lib/Awt2dLibraries.gmk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,9 @@ 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
547-
545+
# Modern HarfBuzz requires c++11; but VS does not have the flag
548546
ifneq ($(OPENJDK_TARGET_OS), windows)
547+
HARFBUZZ_CXXFLAGS := -std=c++11
549548
HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
550549
-DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
551550
-DHB_NO_PRAGMA_GCC_DIAGNOSTIC

0 commit comments

Comments
 (0)