stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8328628: JDK-8328157 incorrectly sets -MT on all compilers in jdk.jpackage

Browse Source 
Reviewed-by: erikj, jwaters
This commit is contained in:
Magnus Ihse Bursie 2024-03-21 11:33:36 +00:00
parent 68170ae222
commit 700679011e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/modules/jdk.jpackage/Lib.gmk
View File

@ -59,11 +59,11 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
CFLAGS_FILTER_OUT := -MD, \
CXXFLAGS_FILTER_OUT := -MD, \
CXXFLAGS := -MT $(JPACKAGE_APPLAUNCHER_INCLUDES), \
CFLAGS := -MT $(JPACKAGE_APPLAUNCHER_INCLUDES), \
CXXFLAGS := $(JPACKAGE_APPLAUNCHER_INCLUDES), \
CFLAGS := $(JPACKAGE_APPLAUNCHER_INCLUDES), \
CFLAGS_macosx := -Wno-format-nonliteral, \
CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
CFLAGS_windows := $(JPACKAGE_CFLAGS_windows), \
CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
CFLAGS_windows := -MT $(JPACKAGE_CFLAGS_windows), \
LD_SET_ORIGIN := false, \
LIBS_macosx := -framework Cocoa -rpath @executable_path/../Frameworks/ -rpath @executable_path/../PlugIns/, \
LIBS_windows := user32.lib ole32.lib msi.lib shlwapi.lib \
@ -137,8 +137,8 @@ ifeq ($(call isTargetOs, windows), true)
OPTIMIZATION := LOW, \
SRC := $(JPACKAGE_WIXHELPER_SRC), \
CXXFLAGS_FILTER_OUT := -MD, \
CXXFLAGS := -MT $(addprefix -I, $(JPACKAGE_WIXHELPER_SRC)), \
CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
CXXFLAGS := $(addprefix -I, $(JPACKAGE_WIXHELPER_SRC)), \
CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
LDFLAGS := $(LDFLAGS_CXX_JDK), \
LIBS := ole32.lib msi.lib User32.lib shlwapi.lib \
Shell32.lib, \
@ -157,8 +157,8 @@ ifeq ($(call isTargetOs, windows), true)
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/msiwrapper, \
SRC := $(JPACKAGE_MSIWRAPPER_SRC), \
CXXFLAGS_FILTER_OUT := -MD, \
CXXFLAGS := -MT $(addprefix -I, $(JPACKAGE_MSIWRAPPER_SRC)), \
CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
CXXFLAGS := $(addprefix -I, $(JPACKAGE_MSIWRAPPER_SRC)), \
CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
LIBS := ole32.lib msi.lib user32.lib shlwapi.lib Shell32.lib, \
))