archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8300254: ASan build does not correctly propagate ASAN_OPTIONS

Browse source 
Reviewed-by: ihse
This commit is contained in:
Justin King 2023-01-17 21:53:34 +00:00 • committed by Magnus Ihse Bursie
parent e37078f5bb
commit 00b6c551ec
4 changed files with 67 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/common/modules/LauncherCommon.gmk
View file

@ -144,9 +144,15 @@ define SetupBuildLauncherBody
$1_WINDOWS_JLI_LIB := $(call FindStaticLib, java.base, jli, /libjli)
$1_EXTRA_FILES := $(LAUNCHER_SRC)/main.c
ifeq ($(ASAN_ENABLED), true)
$1_EXTRA_FILES += $(TOPDIR)/make/data/asan/asan_default_options.c
endif
$$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
NAME := $1, \
EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
EXTRA_FILES := $$($1_EXTRA_FILES), \
OPTIMIZATION := $$($1_OPTIMIZATION), \
CFLAGS := $$(CFLAGS_JDKEXE) \
$$(LAUNCHER_CFLAGS) \