--- old/make/lib/Lib-jdk.incubator.jpackage.gmk	2020-03-26 09:50:52.109271000 -0400
+++ new/make/lib/Lib-jdk.incubator.jpackage.gmk	2020-03-26 09:50:49.891858800 -0400
@@ -59,7 +59,8 @@
     SRC := $(JPACKAGE_APPLAUNCHER_SRC), \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CXXFLAGS_JDKEXE), \
+    CFLAGS := $(CFLAGS_JDKEXE), \
+    CXXFLAGS := $(CXXFLAGS_JDKEXE), \ 
     CFLAGS_windows := -EHsc -DLAUNCHERC -DUNICODE -D_UNICODE, \
     LDFLAGS := $(LDFLAGS_JDKEXE), \
     LIBS_macosx := -framework Cocoa, \