From c7b9c64eed40bbcda1a2f9ca64017e86c35d76d8 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 11 Dec 2019 16:16:39 -0500
Subject: [PATCH] 8235728: JDK-8212780 breaks builds with a custom X11 include
 path

Reviewed-by: prr, herrick
---
 make/lib/Lib-jdk.incubator.jpackage.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/lib/Lib-jdk.incubator.jpackage.gmk b/make/lib/Lib-jdk.incubator.jpackage.gmk
index f9e407d341a..ca4ecefe5f2 100644
--- a/make/lib/Lib-jdk.incubator.jpackage.gmk
+++ b/make/lib/Lib-jdk.incubator.jpackage.gmk
@@ -34,7 +34,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB_APPLAUNCHER, \
     SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libapplauncher, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CXXFLAGS_JDKLIB), \
+    CFLAGS := $(CXXFLAGS_JDKLIB) $(X_CFLAGS), \
     CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \