blob: 1c7408b43321568b36e308d7aa87a5091031c405 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.2 2016/03/12 07:31:02 tnn Exp $
GCC support.
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2016-02-19 14:48:27.000000000 +0000
+++ jdk/make/lib/Awt2dLibraries.gmk
@@ -695,7 +695,6 @@ $(eval $(call SetupNativeCompilation,BUI
$(SHARED_LIBRARY_FLAGS) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
- CFLAGS_solaris := -xc99=no_lib, \
CFLAGS_windows := -DCMS_IS_WINDOWS_, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -1070,7 +1069,7 @@ else # OPENJDK_TARGET_OS not windows
JAWT_LIBS += -lawt
endif
ifndef BUILD_HEADLESS_ONLY
- JAWT_LIBS += -lawt_xawt
+ JAWT_LIBS += $(X_LIBS) -lawt_xawt
else
JAWT_LIBS += -lawt_headless
HEADLESS_CFLAG += -DHEADLESS
|
