| commit | author | age | ||
| 9fc4b4 | 1 | $NetBSD$ |
| G | 2 | |
| 3 | Support SunOS/gcc. XXX: retain solstudio support. | |
| 4 | ||
| 5568bb | 5 | --- a/make/lib/Awt2dLibraries.gmk.orig 2019-01-08 09:40:28.000000000 +0000 |
| NP | 6 | +++ b/make/lib/Awt2dLibraries.gmk |
| 9fc4b4 | 7 | @@ -384,7 +384,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB |
| G | 8 | OPTIMIZATION := HIGHEST, \ |
| 9 | CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ | |
| 10 | $(LCMS_CFLAGS), \ | |
| 11 | - CFLAGS_solaris := -xc99=no_lib, \ | |
| 12 | CFLAGS_windows := -DCMS_IS_WINDOWS_, \ | |
| 13 | EXTRA_HEADER_DIRS := \ | |
| 14 | common/awt/debug \ | |
| 7ca160 | 15 | @@ -557,7 +556,11 @@ ifneq (, $(findstring $(OPENJDK_TARGET_O |
| ea30ff | 16 | HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY |
| 9fc4b4 | 17 | endif |
| e994db | 18 | ifeq ($(call isTargetOs, solaris), true) |
| 9fc4b4 | 19 | + ifeq ($(TOOLCHAIN_TYPE), gcc) |
| ea30ff | 20 | + HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY |
| 9fc4b4 | 21 | + else |
| G | 22 | HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS |
| 5568bb | 23 | + endif |
| 9fc4b4 | 24 | endif |
| 5568bb | 25 | # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. |
| NP | 26 | LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc |
