Skip to content

Commit c3adcb8

Browse files
committedSep 3, 2024
8338916: Build warnings about overriding recipe for jvm-ldflags.txt
Reviewed-by: jwaters, erikj
1 parent 66945e5 commit c3adcb8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed
 

‎make/common/NativeCompilation.gmk

+1
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ define SetupBasicVariables
292292
$1_TARGET := $$($1_OUTPUT_DIR)/$$($1_BASENAME)
293293
$1_NOSUFFIX := $$($1_PREFIX)$$($1_NAME)
294294
$1_SAFE_NAME := $$(strip $$(subst /,_, $1))
295+
$1_UNIQUE_NAME = $$($1_TYPE)_$$(subst /,_,$$(patsubst $$(OUTPUTDIR)/%/,%,$$(dir $$($1_OBJECT_DIR))))_$$($1_NOSUFFIX)
295296
endef
296297

297298
################################################################################

‎make/common/native/Link.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ define CreateDynamicLibraryOrExecutable
200200
endif
201201

202202
# This is for IDE integration purposes only, and is not normally generated
203-
$1_LDFLAGS_FILE := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$($1_NAME)-ldflags.txt
203+
$1_LDFLAGS_FILE := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$($1_UNIQUE_NAME)-ldflags.txt
204204

205205
$1_ALL_LD_ARGS := $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
206206
$$($1_LIBS) $$($1_EXTRA_LIBS)

0 commit comments

Comments
 (0)