From c3adcb843953b599b3c93d6b51afcc709ceaf45b Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 3 Sep 2024 15:31:19 +0000 Subject: [PATCH] 8338916: Build warnings about overriding recipe for jvm-ldflags.txt Reviewed-by: jwaters, erikj --- make/common/NativeCompilation.gmk | 1 + make/common/native/Link.gmk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 265400e900c..66d07df3b78 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -292,6 +292,7 @@ define SetupBasicVariables $1_TARGET := $$($1_OUTPUT_DIR)/$$($1_BASENAME) $1_NOSUFFIX := $$($1_PREFIX)$$($1_NAME) $1_SAFE_NAME := $$(strip $$(subst /,_, $1)) + $1_UNIQUE_NAME = $$($1_TYPE)_$$(subst /,_,$$(patsubst $$(OUTPUTDIR)/%/,%,$$(dir $$($1_OBJECT_DIR))))_$$($1_NOSUFFIX) endef ################################################################################ diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk index d64df1bebb9..23977e954ca 100644 --- a/make/common/native/Link.gmk +++ b/make/common/native/Link.gmk @@ -200,7 +200,7 @@ define CreateDynamicLibraryOrExecutable endif # This is for IDE integration purposes only, and is not normally generated - $1_LDFLAGS_FILE := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$($1_NAME)-ldflags.txt + $1_LDFLAGS_FILE := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$($1_UNIQUE_NAME)-ldflags.txt $1_ALL_LD_ARGS := $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ $$($1_LIBS) $$($1_EXTRA_LIBS)