$NetBSD: patch-jdk_make_sun_xawt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/sun/xawt/Makefile.orig	2014-01-25 07:34:08.000000000 +0000
+++ jdk/make/sun/xawt/Makefile
@@ -51,14 +51,14 @@ include FILES_export_unix.gmk
 AUTO_FILES_JAVA_DIRS = sun/awt/X11
 AUTO_JAVA_PRUNE = WrapperGenerator.java
 
-LDFLAGS += -L$(OPENWIN_LIB)
+LDFLAGS += -L$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB)
 ifeq ($(OS_NAME), netbsd)
 LDFLAGS += -Wl,-R$(OPENWIN_LIB)
 endif
 
 # For Xrender extension.
 ifeq ($(PLATFORM), solaris)
-LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR)
+LDFLAGS += -Wl,-R$(OPENWIN_LIB)
 endif
 
 ifeq ($(PLATFORM), linux)
@@ -170,6 +170,9 @@ endif
 # we will set a flag indicating this mismatch and the JDK source file
 # will interpret it to resolve the problem.
 ifeq ($(PLATFORM), solaris)
+  ifeq ($(CC_VERSION), gcc)
+    CPPFLAGS += -I$(OPENWIN_HOME)/include
+  endif # CC_VERSION
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
   OS_VERSION := $(shell uname -r)
   XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h
