Skip to content

Commit 1c64a45

Browse files
committed
8347501: Make static-launcher fails after JDK-8346669
Reviewed-by: syan, erikj
1 parent b4cd3b1 commit 1c64a45

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

make/common/modules/LauncherCommon.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
5959
# OUTPUT_DIR Override default output directory
6060
# VERSION_INFO_RESOURCE Override default Windows resource file
6161
# STATIC_LAUNCHER If true, will use settings for building a static launcher
62+
# LIBS Additional libraries to pass as LIBS argument to SetupJdkExecutable
6263
SetupBuildLauncher = $(NamedParamsMacroTemplate)
6364
define SetupBuildLauncherBody
6465
# Setup default values (unless overridden)
@@ -155,6 +156,7 @@ define SetupBuildLauncherBody
155156
LDFLAGS_FILTER_OUT := $$($1_LDFLAGS_FILTER_OUT), \
156157
JDK_LIBS := $$($1_JDK_LIBS), \
157158
JDK_LIBS_windows := $$($1_JDK_LIBS_windows), \
159+
LIBS := $$($1_LIBS), \
158160
LINK_TYPE := $$($1_LINK_TYPE), \
159161
OUTPUT_DIR := $$($1_OUTPUT_DIR), \
160162
OBJECT_DIR := $$($1_OBJECT_DIR), \

0 commit comments

Comments
 (0)